From 77810f78a7287732e7fc8c4b07ecc5d85d41664d Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Thu, 7 Sep 2023 23:15:21 +0200
Subject: [PATCH] Update fencing, and more minor route corrections

---
 GIS Base Map/Gun Run.qgs      | 33677 ++++++++++++++++----------------
 GIS Base Map/Gun Run.qgs~     | 33677 ++++++++++++++++----------------
 GIS Base Map/all_routes.shp   |   Bin 22164 -> 22180 bytes
 GIS Base Map/all_routes.shx   |   Bin 132 -> 132 bytes
 GIS Base Map/fencing.dbf      |   Bin 45665 -> 45426 bytes
 GIS Base Map/fencing.shp      |   Bin 16848 -> 16616 bytes
 GIS Base Map/fencing.shx      |   Bin 1100 -> 1092 bytes
 GIS Base Map/water_tables.dbf |   Bin 901 -> 901 bytes
 GIS Base Map/water_tables.shp |   Bin 1052 -> 928 bytes
 GIS Base Map/water_tables.shx |   Bin 156 -> 156 bytes
 10 files changed, 34022 insertions(+), 33332 deletions(-)

diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 114e58c..7d01830 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.32.2-Lima" saveUser="tim" projectname="Gun Run" saveDateTime="2023-09-07T12:34:25" saveUserFull="Timothy Allen">
+<qgis saveUserFull="Timothy Allen" version="3.32.2-Lima" saveUser="tim" saveDateTime="2023-09-07T23:12:25" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,270 +17,255 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer combined-method="0" is-active="0" edl-distance-unit="0" edl-strength="1000" edl-is-active="1" hillshading-is-multidirectional="0" light-azimuth="315" edl-distance="0.5" hillshading-is-active="0" hillshading-z-factor="1" light-altitude="45"/>
+  <elevation-shading-renderer edl-distance-unit="0" edl-strength="1000" light-altitude="45" edl-distance="0.5" hillshading-is-active="0" combined-method="0" hillshading-is-multidirectional="0" edl-is-active="1" is-active="0" hillshading-z-factor="1" light-azimuth="315"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Marshals">
+    <layer-tree-group expanded="1" name="Marshals" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions [456]" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./extra_security.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="extra_security20170921130834191" name="extra_security" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="extra_security" source="./extra_security.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="extra_security20170921130834191">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="delimitedtext" id="marshals_by_position20161003112326575" name="marshals_by_position" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_exp="" providerKey="delimitedtext" id="marshals_by_position20161003112326575">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position [457]" type="QString" name="cached_name"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" expanded="0" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51">
         <customproperties>
           <Option type="Map">
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
+    <layer-tree-group expanded="0" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./fencing.shp|layername=fencing" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" type="QString" name="cached_name"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" providerKey="virtual" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="cone_only_groups" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" name="fence_and_cone_groups" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+    <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
+      <layer-tree-group expanded="1" name="Markers" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer legend_split_behavior="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={7a8ff1d9-6814-40ca-b26c-2833d6a46353}" expanded="1" patch_size="-1,-1" checked="Qt::Checked" providerKey="memory" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" name="route_markers" legend_exp="">
+        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" checked="Qt::Checked" legend_exp="" providerKey="memory" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549">
           <customproperties>
             <Option type="Map">
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option name="showFeatureCount" type="int" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer legend_split_behavior="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)&amp;uid={1c25b21e-66a8-46a9-bcf9-b32d266b915e}" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" providerKey="memory" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="route_markers" legend_exp="">
+        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={458fbc48-5594-4b39-9810-4ac65744537d}" checked="Qt::Unchecked" legend_exp="" providerKey="memory" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02">
           <customproperties>
             <Option type="Map">
-              <Option type="invalid" name="expandedLegendNodes"/>
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option name="expandedLegendNodes"/>
+              <Option name="showFeatureCount" type="int" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="0" type="int" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes"/>
+            <Option name="showFeatureCount" type="int" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" expanded="0" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" legend_exp="">
+    <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f">
       <customproperties>
-        <Option type="Map">
-          <Option value="timelapse" type="QString" name="cached_name"/>
-        </Option>
+        <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Feeding Stations">
+    <layer-tree-group expanded="1" name="Feeding Stations" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./water_tables.shp" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="water_tables20170921142016467" name="water_tables" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="water_tables" source="./water_tables.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="water_tables20170921142016467">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
+    <layer-tree-group expanded="0" name="Ask Me" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="poi_labels" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="directions_to_start" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./mayor.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="mayor" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./viplabels.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="viplabels" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./vipaccess.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="vipaccess" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./golfaccess.shp" expanded="0" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="residents_access_roads" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
+    <layer-tree-group expanded="0" name="Residents Access" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./osm_roads.shp" expanded="0" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="mayor" source="./mayor.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="viplabels" source="./viplabels.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="vipaccess" source="./vipaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="golfaccess" source="./golfaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="OSM data" groupLayer="" checked="Qt::Checked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="osm_roads" source="./osm_roads.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="osm_places" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
+    <layer-tree-group expanded="1" name="Start and Finish pages" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./data-comments.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="data-comments" source="./data-comments.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./start_finish_area.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="start_finish_area" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
+    <layer-tree-group expanded="0" name="Elevation" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./capetownelevation-1m.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="capetownelevation-1m" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
         <customproperties>
           <Option type="Map">
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
+    <layer-tree-group expanded="1" name="Map" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" expanded="0" patch_size="0,0" checked="Qt::Checked" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_exp="" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="Outlines" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_exp="" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -311,37 +296,39 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43</item>
       <item>route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02</item>
+      <item>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</item>
+      <item>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings maxScale="0" tolerance="10" minScale="0" enabled="0" self-snapping="1" intersection-snapping="1" unit="1" scaleDependencyMode="0" type="1" mode="3">
+  <snapping-settings self-snapping="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" tolerance="10" enabled="0" maxScale="0" type="1" unit="1">
     <individual-layer-settings>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="0" minScale="0" enabled="0" id="water_tables20170921142016467" units="2" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="0" minScale="0" enabled="0" id="extra_security20170921130834191" units="2" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" type="0"/>
-      <layer-setting maxScale="0" tolerance="20" minScale="0" enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" type="0"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" units="1" type="1"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="water_tables20170921142016467"/>
+      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="extra_security20170921130834191"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+      <layer-setting minScale="0" tolerance="20" enabled="1" maxScale="0" type="2" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -349,10 +336,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.38450671881076914</xmin>
-      <ymin>-33.92010227189385319</ymin>
-      <xmax>18.39075947006352862</xmax>
-      <ymax>-33.91261403108947547</ymax>
+      <xmin>18.39553763047966228</xmin>
+      <ymin>-33.91875794015667367</ymin>
+      <xmax>18.42054863549070021</xmax>
+      <ymax>-33.88880497692461091</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -373,171 +360,176 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" open="true" name="Marshals">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup open="true" name="Marshals" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshal_positions" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="extra_security" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshals_by_position" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="complete_marshal_overview" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="marshal_overviews" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Fencing and Cones">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="fencing" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fencing" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="cone_only_groups" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="cone_groups" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_and_cone_groups" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_groups" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+        </filegroup>
+      </legendlayer>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_and_cone_groups" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Routes">
-      <legendgroup checked="Qt::Checked" open="true" name="Markers">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+    <legendgroup open="true" name="Routes" checked="Qt::Checked">
+      <legendgroup open="true" name="Markers" checked="Qt::Checked">
+        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Checked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
           </filegroup>
         </legendlayer>
-        <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" visible="0" layerid="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Unchecked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="all_routes" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0">
-      <filegroup hidden="false" open="false">
-        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+    <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="timelapse" checked="Qt::Unchecked">
+      <filegroup open="false" hidden="false">
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
+    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="water_tables" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="poi_labels" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="directions_to_start" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="mayor" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="mayor" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="viplabels" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="vipaccess" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="golfaccess" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access_roads" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="1" name="osm_roads" checked="Qt::Checked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="osm_places" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="data-comments" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="start_finish_area" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="capetownelevation-1m" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup open="true" name="Map" checked="Qt::Checked">
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="Outlines" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer maxScale="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="0" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="annotation" autoRefreshTime="0">
+  <main-annotation-layer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="annotation">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -598,7 +590,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer maxScale="100000" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="raster" autoRefreshTime="0">
+    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="100000" type="raster">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -664,7 +656,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -675,9 +667,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -689,97 +681,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" band="1" zoffset="0" zscale="1" enabled="0">
+      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -788,28 +780,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Value" type="QString" name="identify/format"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Value"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer alphaBand="-1" blueBand="3" nodataColor="" greenBand="2" opacity="0.5" type="multibandcolor" redBand="1">
+        <rasterrenderer nodataColor="" opacity="0.5" blueBand="3" alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -821,13 +813,13 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" invertColors="0" colorizeRed="255" colorizeGreen="128" saturation="0" grayscaleMode="0"/>
+        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="raster" autoRefreshTime="0">
+    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="raster">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -893,7 +885,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -904,7 +896,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -916,97 +908,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" band="1" zoffset="0" zscale="1" enabled="0">
+      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1015,28 +1007,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Undefined" type="QString" name="identify/format"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Undefined"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer band="1" alphaBand="-1" nodataColor="" opacity="0.75" type="singlebandcolordata">
+        <rasterrenderer nodataColor="" opacity="0.75" alphaBand="-1" band="1" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1048,13 +1040,13 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" invertColors="0" colorizeRed="255" colorizeGreen="128" saturation="0" grayscaleMode="0"/>
+        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1120,7 +1112,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="EPSG:4326" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1134,8 +1126,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="$length * 100" comment="" typeName="double precision" precision="0" name="length_km" type="6" subType="0"/>
-        <field length="-1" expression="$length * 100 * 1000" comment="" typeName="double precision" precision="0" name="length_m" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1148,264 +1140,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="RouteLen" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="RouteLen" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" description="Only show when active in Atlas">
-            <rule symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM" description="This should be disabled, since it's only for legends"/>
-            <rule symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM" description="This should be disabled, since it's only for legends"/>
-            <rule symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM" description="This should be disabled, since it's only for legends"/>
-            <rule symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail" description="This should be disabled, since it's only for legends"/>
+          <rule label="Show by day" symbol="0" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule label="21KM" symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule label="10KM" symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule label="5KM" symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule label="Trail" symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show"/>
-          <rule symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day"/>
+          <rule label="Always show" symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule label="Always show by day" symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@0@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1413,308 +1405,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{d9268524-45f1-4731-945d-c43780c8de62}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1722,308 +1714,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.25"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@2@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2031,308 +2023,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@3@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@3@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2340,308 +2332,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@4@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@4@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@4@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2649,302 +2641,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@4@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@4@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="5" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="6" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="6" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.46" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.46"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2956,334 +2948,334 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" description="Active routes">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round($length / 1000, 0)" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="km_marker()" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="1" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="1" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" description="Route lengths">
+          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100, 4 )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="km_marker()" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="50" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapAtNoCost" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="50" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapAtNoCost" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3292,77 +3284,77 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{99bd229d-7319-436f-b616-1be11812c381}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3370,16 +3362,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3390,8 +3382,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3400,8 +3392,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3410,8 +3402,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3420,8 +3412,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3430,8 +3422,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3454,8 +3446,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3464,8 +3456,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3474,24 +3466,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="begin" index="1" name=""/>
-        <alias field="end" index="2" name=""/>
-        <alias field="Distance" index="3" name=""/>
-        <alias field="RouteLen" index="4" name=""/>
-        <alias field="Sort" index="5" name=""/>
-        <alias field="day" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="length_m" index="9" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -3518,49 +3510,49 @@
         <default expression="" field="length_m" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="$length * 100" comment="" typeName="double precision" precision="0" name="length_km" type="6" subType="0"/>
-        <field length="-1" expression="$length * 100 * 1000" comment="" typeName="double precision" precision="0" name="length_m" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="121" type="field" name="Name"/>
-          <column hidden="0" width="141" type="field" name="begin"/>
-          <column hidden="0" width="31" type="field" name="end"/>
-          <column hidden="0" width="66" type="field" name="Distance"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="39" type="field" name="RouteLen"/>
-          <column hidden="0" width="250" type="field" name="Source"/>
-          <column hidden="0" width="175" type="field" name="length_m"/>
-          <column hidden="0" width="50" type="field" name="Sort"/>
-          <column hidden="0" width="31" type="field" name="day"/>
-          <column hidden="0" width="266" type="field" name="length_km"/>
+          <column width="121" name="Name" hidden="0" type="field"/>
+          <column width="141" name="begin" hidden="0" type="field"/>
+          <column width="31" name="end" hidden="0" type="field"/>
+          <column width="66" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="39" name="RouteLen" hidden="0" type="field"/>
+          <column width="250" name="Source" hidden="0" type="field"/>
+          <column width="175" name="length_m" hidden="0" type="field"/>
+          <column width="50" name="Sort" hidden="0" type="field"/>
+          <column width="31" name="day" hidden="0" type="field"/>
+          <column width="266" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3606,39 +3598,39 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3712,189 +3704,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{53b6bbaf-4722-434f-a142-936b95477967}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="183,72,75,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <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="0.26"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3905,15 +3897,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3943,9 +3935,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias name="" index="0" field="ID"/>
+        <alias name="" index="1" field="height"/>
+        <alias name="" index="2" field="elevation"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="ID"/>
@@ -3958,20 +3950,20 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="elevation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="ID" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="height" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="elevation" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="ID" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="height" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="elevation" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3994,7 +3986,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Polygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4070,173 +4062,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <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="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4247,17 +4239,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -4294,10 +4286,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -4312,22 +4304,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4350,25 +4342,539 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Polygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+      <extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89967145949319871</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89967145949319871</ymax>
+      </wgs84extent>
+      <id>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</id>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>fence_and_cone_groups</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
+        <links/>
+        <dates/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
+      </resourceMetadata>
+      <provider encoding="">virtual</provider>
+      <vectorjoins/>
+      <layerDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </layerDependencies>
+      <dataDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </dataDependencies>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <metadataUrls/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+              <Option type="Map">
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+        <symbols>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="cross"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </symbols>
+        <rotation/>
+        <sizescale/>
+      </renderer-v2>
+      <customproperties>
+        <Option type="Map">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;name&quot;"/>
+          </Option>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+          <axisSymbol>
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+        <properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks/>
+        <checkConfiguration type="Map">
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
+          </Option>
+        </checkConfiguration>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field name="name" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="group" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="type" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="fence_len" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="cone_len" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
+        <alias name="" index="5" field="cone_len"/>
+      </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="fence_len"/>
+        <policy policy="Duplicate" field="cone_len"/>
+      </splitPolicies>
+      <defaults>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column width="306" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+    geom = feature.geometry()
+    control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field editable="1" name="cone_len"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
+      </editable>
+      <labelOnTop>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+      </labelOnTop>
+      <reuseLastValue>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+      </reuseLastValue>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>"name"</previewExpression>
+      <mapTip enabled="1"></mapTip>
+    </maplayer>
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42000208179202403</xmax>
-        <ymax>-33.89964429152626479</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42000208179202403</xmax>
-        <ymax>-33.89964429152626479</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </wgs84extent>
       <id>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>cone_only_groups</layername>
+      <layername>cone_groups</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -4426,173 +4932,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="38,162,105,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="f_diagonal" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="f_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4603,68 +5109,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="int" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="1" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="0" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4672,22 +5178,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="1" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -4731,11 +5237,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -4752,31 +5258,32 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="306" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="group"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="cone_len"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="306" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4815,25 +5322,25 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4899,7 +5406,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4924,189 +5431,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,85,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,85,255,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5117,151 +5624,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="Name" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="Name" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="LineGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="LineGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5269,16 +5776,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5301,8 +5808,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Name"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -5313,22 +5820,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="Name" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5364,8 +5871,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5373,7 +5880,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5439,7 +5946,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5464,319 +5971,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" description="Only show when active in Atlas"/>
-          <rule symbol="1" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" description="Only show when active in Atlas"/>
-          <rule symbol="2" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" description="Only show when active in Atlas"/>
+          <rule label="21KM" symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule label="10KM" symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule label="5KM" symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="miter" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="area" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="miter"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="210,32,39,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="area"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@0@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5784,147 +6291,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <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="MapUnit"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5932,100 +6439,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{43e5e783-9402-4471-b264-9b43c9035744}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6033,147 +6540,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@2@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="69,100,25,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6181,100 +6688,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@2@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6282,41 +6789,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="69,100,25,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <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="MapUnit"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="69,100,25,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6328,66 +6835,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6395,16 +6902,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6422,16 +6929,16 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Distance"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -6442,22 +6949,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="Distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="Distance"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="id"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6502,17 +7009,17 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6520,7 +7027,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6594,187 +7101,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.796078" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="0.796078" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="227,0,185,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="227,0,185,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6785,268 +7292,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="8" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="1" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="8" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="1" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="4" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="227,0,185,255">
+              <text-style fontSize="4" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="227,0,185,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="2" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -7055,200 +7562,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7256,16 +7763,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="10" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="10" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7276,8 +7783,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7286,8 +7793,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7296,17 +7803,17 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -7319,25 +7826,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="position"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7413,25 +7920,25 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer wkbType="Polygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
       <extent>
-        <xmin>18.37673321782479974</xmin>
-        <ymin>-33.94582464707783487</ymin>
+        <xmin>18.37682610786999859</xmin>
+        <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.90152236072362513</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37673321782479974</xmin>
-        <ymin>-33.94582464707783487</ymin>
+        <xmin>18.37682610786999859</xmin>
+        <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.90152236072362513</ymax>
       </wgs84extent>
       <id>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</id>
-      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>fence_and_cone_groups</layername>
+      <layername>fence_groups</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -7479,7 +7986,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7508,173 +8015,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,85,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,85,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,85,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,85,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7685,68 +8192,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7754,22 +8261,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="1" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -7804,13 +8311,6 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
         <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
@@ -7820,19 +8320,17 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
         <policy policy="Duplicate" field="group"/>
         <policy policy="Duplicate" field="type"/>
         <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="cone_len"/>
         <policy policy="Duplicate" field="fence_len"/>
       </splitPolicies>
       <defaults>
@@ -7840,38 +8338,35 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="group" applyOnUpdate="0"/>
         <default expression="" field="type" applyOnUpdate="0"/>
         <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
         <default expression="" field="fence_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="415" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="group"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="cone_len"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="fence_len"/>
+          <column width="415" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7911,38 +8406,38 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </wgs84extent>
       <id>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</id>
       <datasource>./fencing.shp|layername=fencing</datasource>
@@ -7997,7 +8492,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8011,26 +8506,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="cone_len" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis maxScale="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" version="3.8.3-Zanzibar" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyDrawingTol="1" readOnly="0">
+          <qgis simplifyDrawingHints="1" simplifyLocal="1" minScale="1e+08" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" readOnly="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" version="3.8.3-Zanzibar" maxScale="0" simplifyAlgorithm="0" simplifyDrawingTol="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
+            <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
+                <rule label="Visible" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol clip_to_extent="1" force_rhr="0" alpha="1" name="0" type="line">
-                  <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <symbol alpha="1" clip_to_extent="1" name="0" force_rhr="0" type="line">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8049,9 +8544,9 @@ def my_form_open(dialog, layer, feature):
                     <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8060,64 +8555,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style textOpacity="0.8" fontSize="11" fieldName="comment" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" isExpression="0" fontUnderline="0" namedStyle="Regular" fontWordSpacing="0" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" blendMode="0" textColor="0,0,0,255" fontCapitals="0">
-                      <text-buffer bufferBlendMode="0" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255"/>
-                      <background shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="0.6" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1"/>
-                      <shadow shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style fontSize="11" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.8" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Regular" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="comment">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                      <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.6" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" wrapChar="" rightDirectionSymbol=">" autoWrapLength="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0"/>
-                    <placement rotationAngle="0" maxCurvedCharAngleOut="-25" centroidWhole="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" offsetUnits="MM" priority="5" preserveRotation="1" xOffset="0" yOffset="0" geometryGenerator="" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" placement="4" placementFlags="2" offsetType="0" dist="5" fitInPolygonOnly="0" quadOffset="4"/>
-                    <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" displayAll="1" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="1" labelPerPart="0"/>
+                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" placementFlags="2" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="5" yOffset="0" rotationAngle="0" distUnits="MM"/>
+                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" displayAll="1" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style textOpacity="1" fontSize="12" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" fontWordSpacing="0" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" blendMode="0" textColor="0,0,0,255" fontCapitals="0">
-                      <text-buffer bufferBlendMode="0" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255"/>
-                      <background shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0"/>
-                      <shadow shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style fontSize="12" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Semibold" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                      <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" wrapChar="" rightDirectionSymbol=">" autoWrapLength="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0"/>
-                    <placement rotationAngle="0" maxCurvedCharAngleOut="-25" centroidWhole="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" offsetUnits="MM" priority="5" preserveRotation="1" xOffset="0" yOffset="0" geometryGenerator="" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" placement="2" placementFlags="15" offsetType="0" dist="1" fitInPolygonOnly="0" quadOffset="4"/>
-                    <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" displayAll="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" placementFlags="15" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="1" yOffset="0" rotationAngle="0" distUnits="MM"/>
+                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" displayAll="0" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8133,18 +8628,18 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory labelPlacementMethod="XHeight" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" rotationOffset="270" penAlpha="255" backgroundAlpha="255" minimumSize="0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory opacity="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penWidth="0" penAlpha="255" width="15" rotationOffset="270" minScaleDenominator="0" barWidth="5" backgroundAlpha="255" minimumSize="0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute label="" color="#000000" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" zIndex="0" priority="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1">
+            <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -8232,17 +8727,17 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias name="" index="0" field="id"/>
+              <alias name="" index="1" field="group"/>
+              <alias name="" index="2" field="comment"/>
+              <alias name="" index="3" field="moveable"/>
+              <alias name="" index="4" field="type"/>
+              <alias name="" index="5" field="name"/>
+              <alias name="" index="6" field="hidden"/>
+              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
+              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
+              <alias name="" index="9" field="fence_len"/>
+              <alias name="" index="10" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -8260,53 +8755,53 @@ def my_form_open(dialog, layer, feature):
               <default expression="" field="cone_len" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="comment" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="id"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="group"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="comment"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="moveable"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="type"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="name"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="hidden"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="fence_len"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint desc="" field="id" exp=""/>
+              <constraint desc="" field="group" exp=""/>
+              <constraint desc="" field="comment" exp=""/>
+              <constraint desc="" field="moveable" exp=""/>
+              <constraint desc="" field="type" exp=""/>
+              <constraint desc="" field="name" exp=""/>
+              <constraint desc="" field="hidden" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+              <constraint desc="" field="fence_len" exp=""/>
+              <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="cone_len" type="6" subType="0"/>
+              <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="0" width="-1" name="id" type="field"/>
-                <column hidden="0" width="-1" name="group" type="field"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" name="comment" type="field"/>
-                <column hidden="0" width="-1" name="moveable" type="field"/>
-                <column hidden="0" width="-1" name="type" type="field"/>
-                <column hidden="0" width="414" name="name" type="field"/>
-                <column hidden="0" width="-1" name="hidden" type="field"/>
-                <column hidden="0" width="-1" name="fence_len" type="field"/>
-                <column hidden="0" width="-1" name="cone_len" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positiony" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positionx" type="field"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8351,18 +8846,18 @@ def my_form_open(dialog, layer, feature):
               <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8379,458 +8874,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <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="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones"/>
-            <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences"/>
-            <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences"/>
-            <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction"/>
+          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible"/>
-          <rule symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule label="Is Visible" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+          <rule label="Always show" symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="1;4" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="Point" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dot" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="1;4"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="Point"/>
+                <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="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dot"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="4;3" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="4;3"/>
+                <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="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="5" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8838,530 +9333,670 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
+        <rules key="{77c2da81-3827-4244-9739-7740942dd20c}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{63187879-e575-420a-b139-9295c560dc57}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.80000000000000004" fontSize="11" multilineHeightUnit="Percentage" fieldName="comment" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="comment" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOpacity="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeJoinStyle="128" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.6" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="255,255,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.6"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="5" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8200000000000001" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="1" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="5" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8200000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" description="Fence lengths">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{1125f4a3-b660-4c4e-bb30-9a3f89c0fc6e}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="11" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="6" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" description="Cones lengths">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{8c77ba5e-b512-4ff7-b7ad-7fb26939c5cd}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="11" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="6" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{db4fb198-5646-4029-8e3c-b5f68e241df8}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="11" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="6" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule active="0" filter="&quot;hidden&quot; IS NULL" description="Always show" key="{a7eac08d-b9bd-4780-93fa-cd225df55dde}">
+            <settings calloutType="simple">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <families/>
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <Option type="Map">
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -9370,68 +10005,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;id&quot;" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9439,16 +10074,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9527,16 +10162,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="comment"/>
+        <alias name="" index="3" field="moveable"/>
+        <alias name="" index="4" field="type"/>
+        <alias name="" index="5" field="name"/>
+        <alias name="" index="6" field="hidden"/>
+        <alias name="" index="7" field="day"/>
+        <alias name="" index="8" field="fence_len"/>
+        <alias name="" index="9" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -9563,50 +10198,50 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="comment" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="comment" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="moveable" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="hidden" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="cone_len" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;name&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="group"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="373" type="field" name="comment"/>
-          <column hidden="0" width="-1" type="field" name="moveable"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="316" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="hidden"/>
-          <column hidden="0" width="-1" type="field" name="fence_len"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="cone_len"/>
+          <column width="31" name="id" hidden="0" type="field"/>
+          <column width="52" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="143" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="303" name="name" hidden="0" type="field"/>
+          <column width="54" name="hidden" hidden="0" type="field"/>
+          <column width="74" name="fence_len" hidden="0" type="field"/>
+          <column width="40" name="day" hidden="0" type="field"/>
+          <column width="65" name="cone_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9653,38 +10288,38 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="comment"/>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="hidden"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="moveable"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="comment" reuseLastValue="0"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="hidden" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="moveable" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -9758,189 +10393,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,178,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,178,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9951,66 +10586,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10018,16 +10653,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10043,7 +10678,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -10052,19 +10687,19 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="id" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10099,7 +10734,7 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10107,7 +10742,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10181,173 +10816,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="26,0,201,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="dot" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="26,0,201,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="dot"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10358,77 +10993,77 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10436,22 +11071,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option value="true" type="bool" name="active"/>
-                <Option value="id" type="QString" name="field"/>
-                <Option value="2" type="int" name="type"/>
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10462,8 +11097,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10472,8 +11107,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10482,8 +11117,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10497,10 +11132,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -10515,28 +11150,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="page"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10573,9 +11208,9 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10583,7 +11218,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -10649,7 +11284,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10660,7 +11295,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" dynamicForm="0" upsertOnEdit="1" editable="1" cascadedDelete="0" targetFieldName="position" hasCustomPrefix="1" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position">
+        <join customPrefix="csv_" joinFieldName="position" memoryCache="0" editable="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -10687,264 +11322,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="id" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="id" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="114,155,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="114,155,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan" description="Show in marshal overview"/>
-          <rule symbol="1" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan"/>
-          <rule symbol="2" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps"/>
+          <rule label="Show by day in marshal plan" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule label="Always show in marshal plan" symbol="1" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule label="Show in marshal maps" symbol="2" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.8" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.8" type="marker" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.01" type="marker" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="0.01" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10953,824 +11588,824 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="2" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="2" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
+          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.5" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.5" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="AlwaysShow" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="FontOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontStyle">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ShapeOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ShapeOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="8" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="5" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.59999999999999998" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.59999999999999998" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="8" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="5" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="8" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="133,182,111,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="133,182,111,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="10" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -11779,204 +12414,205 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{444d8fb8-2321-4272-9699-88b713425993}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11984,16 +12620,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12004,8 +12640,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12014,8 +12650,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12024,8 +12660,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12034,8 +12670,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12049,11 +12685,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -12070,31 +12706,31 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="notes" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="notes" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="position"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="notes"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12173,85 +12809,85 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_email"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_day"/>
-        <field labelOnTop="0" name="csv_days"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_firstname"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_race"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="csv_surname"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="marshals_by_position_captain"/>
-        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
-        <field labelOnTop="0" name="marshals_by_position_club"/>
-        <field labelOnTop="0" name="marshals_by_position_day"/>
-        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_instructions"/>
-        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_position"/>
-        <field labelOnTop="0" name="marshals_by_position_race"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_email" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_day" labelOnTop="0"/>
+        <field name="csv_days" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_firstname" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_race" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="csv_surname" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="marshals_by_position_captain" labelOnTop="0"/>
+        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
+        <field name="marshals_by_position_club" labelOnTop="0"/>
+        <field name="marshals_by_position_day" labelOnTop="0"/>
+        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_instructions" labelOnTop="0"/>
+        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_position" labelOnTop="0"/>
+        <field name="marshals_by_position_race" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="csv_captain"/>
-        <field reuseLastValue="0" name="csv_captain_email"/>
-        <field reuseLastValue="0" name="csv_captain_phone"/>
-        <field reuseLastValue="0" name="csv_club"/>
-        <field reuseLastValue="0" name="csv_day"/>
-        <field reuseLastValue="0" name="csv_days"/>
-        <field reuseLastValue="0" name="csv_email"/>
-        <field reuseLastValue="0" name="csv_first_runner"/>
-        <field reuseLastValue="0" name="csv_firstname"/>
-        <field reuseLastValue="0" name="csv_instructions"/>
-        <field reuseLastValue="0" name="csv_last_runner"/>
-        <field reuseLastValue="0" name="csv_name"/>
-        <field reuseLastValue="0" name="csv_phone"/>
-        <field reuseLastValue="0" name="csv_position"/>
-        <field reuseLastValue="0" name="csv_race"/>
-        <field reuseLastValue="0" name="csv_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
-        <field reuseLastValue="0" name="marshals_by_position_club"/>
-        <field reuseLastValue="0" name="marshals_by_position_day"/>
-        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
-        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_position"/>
-        <field reuseLastValue="0" name="marshals_by_position_race"/>
-        <field reuseLastValue="0" name="notes"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="type"/>
-        <field reuseLastValue="0" name="xyposition"/>
+        <field name="csv_captain" reuseLastValue="0"/>
+        <field name="csv_captain_email" reuseLastValue="0"/>
+        <field name="csv_captain_phone" reuseLastValue="0"/>
+        <field name="csv_club" reuseLastValue="0"/>
+        <field name="csv_day" reuseLastValue="0"/>
+        <field name="csv_days" reuseLastValue="0"/>
+        <field name="csv_email" reuseLastValue="0"/>
+        <field name="csv_first_runner" reuseLastValue="0"/>
+        <field name="csv_firstname" reuseLastValue="0"/>
+        <field name="csv_instructions" reuseLastValue="0"/>
+        <field name="csv_last_runner" reuseLastValue="0"/>
+        <field name="csv_name" reuseLastValue="0"/>
+        <field name="csv_phone" reuseLastValue="0"/>
+        <field name="csv_position" reuseLastValue="0"/>
+        <field name="csv_race" reuseLastValue="0"/>
+        <field name="csv_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
+        <field name="marshals_by_position_club" reuseLastValue="0"/>
+        <field name="marshals_by_position_day" reuseLastValue="0"/>
+        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
+        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_position" reuseLastValue="0"/>
+        <field name="marshals_by_position_race" reuseLastValue="0"/>
+        <field name="notes" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+        <field name="xyposition" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -12301,7 +12937,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" geometry="No geometry" wkbType="NoGeometry" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="vector" readOnly="0" autoRefreshTime="0">
+    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" readOnly="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" maxScale="100000" type="vector" geometry="No geometry" wkbType="NoGeometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12355,7 +12991,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" miny="0" dimensions="2" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start/>
@@ -12380,138 +13016,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" accumulate="0" limitMode="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start/>
           <end/>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" showMarkerSymbolInSurfacePlots="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" name="" is_animated="0" type="line">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" name="" is_animated="0" type="fill">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" name="" is_animated="0" type="marker">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12520,13 +13156,13 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="first_name" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -12549,8 +13185,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12573,8 +13209,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12597,8 +13233,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12640,19 +13276,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="first_name" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="club" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="race" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias name="" index="0" field="day"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="first_name"/>
+        <alias name="" index="3" field="surname"/>
+        <alias name="" index="4" field="club"/>
+        <alias name="" index="5" field="phone"/>
+        <alias name="" index="6" field="email"/>
+        <alias name="" index="7" field="captain"/>
+        <alias name="" index="8" field="captain_phone"/>
+        <alias name="" index="9" field="race"/>
+        <alias name="" index="10" field="first_runner"/>
+        <alias name="" index="11" field="last_runner"/>
+        <alias name="" index="12" field="instructions"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="day"/>
@@ -12685,55 +13321,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="surname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="club" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="email" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain_phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="race" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="last_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="instructions" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="day"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="position"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_name"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="surname"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="club"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="phone"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="email"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain_phone"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="race"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_runner"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="last_runner"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="first_name" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="race" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="first_name" exp=""/>
+        <constraint desc="" field="surname" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="phone" exp=""/>
+        <constraint desc="" field="email" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="race" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="club" type="field"/>
-          <column hidden="0" width="-1" name="phone" type="field"/>
-          <column hidden="0" width="-1" name="email" type="field"/>
-          <column hidden="0" width="-1" name="captain" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="first_runner" type="field"/>
-          <column hidden="0" width="-1" name="last_runner" type="field"/>
-          <column hidden="0" width="-1" name="instructions" type="field"/>
-          <column hidden="0" width="-1" name="surname" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="first_name" type="field"/>
-          <column hidden="0" width="-1" name="race" type="field"/>
-          <column hidden="0" width="-1" name="captain_phone" type="field"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="first_name" hidden="0" type="field"/>
+          <column width="-1" name="race" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12789,52 +13425,52 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_email"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="captain_phone"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="days"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="firstname"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="surname"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_email" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="captain_phone" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="days" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="firstname" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="surname" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="captain"/>
-        <field reuseLastValue="0" name="captain_email"/>
-        <field reuseLastValue="0" name="captain_phone"/>
-        <field reuseLastValue="0" name="club"/>
-        <field reuseLastValue="0" name="days"/>
-        <field reuseLastValue="0" name="email"/>
-        <field reuseLastValue="0" name="first_runner"/>
-        <field reuseLastValue="0" name="firstname"/>
-        <field reuseLastValue="0" name="instructions"/>
-        <field reuseLastValue="0" name="last_runner"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="phone"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="surname"/>
+        <field name="captain" reuseLastValue="0"/>
+        <field name="captain_email" reuseLastValue="0"/>
+        <field name="captain_phone" reuseLastValue="0"/>
+        <field name="club" reuseLastValue="0"/>
+        <field name="days" reuseLastValue="0"/>
+        <field name="email" reuseLastValue="0"/>
+        <field name="first_runner" reuseLastValue="0"/>
+        <field name="firstname" reuseLastValue="0"/>
+        <field name="instructions" reuseLastValue="0"/>
+        <field name="last_runner" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="phone" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="surname" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"/>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -12900,7 +13536,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12925,326 +13561,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="141,90,153,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="141,90,153,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{743d2826-031c-45d5-809e-09f032abdd16}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13257,66 +13893,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13324,16 +13960,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13356,8 +13992,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -13368,22 +14004,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13419,8 +14055,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13428,7 +14064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -13494,7 +14130,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13519,334 +14155,334 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="232,113,141,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="232,113,141,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="0.75" fontSize="8.5" multilineHeightUnit="Percentage" fieldName="name" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="8.5" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.75" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1.5" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1.5" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelRotation" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="PositionX">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_x" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                  <Option name="PositionX" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_x"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="PositionY">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_y" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                  <Option name="PositionY" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_y"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="1" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="2" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="0.20000000000000001" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="2" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.20000000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13854,16 +14490,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13874,8 +14510,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13884,8 +14520,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13894,8 +14530,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13904,8 +14540,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13914,8 +14550,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13924,8 +14560,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13934,8 +14570,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13944,8 +14580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13954,23 +14590,23 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="osm_id"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="type"/>
+        <alias name="" index="4" field="z_order"/>
+        <alias name="" index="5" field="population"/>
+        <alias name="" index="6" field="label_x"/>
+        <alias name="" index="7" field="label_y"/>
+        <alias name="" index="8" field="label_rota"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -13995,43 +14631,43 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="label_rota" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="population" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="population" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="osm_id"/>
-          <column hidden="0" width="-1" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="z_order"/>
-          <column hidden="0" width="-1" type="field" name="population"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="label_x"/>
-          <column hidden="0" width="-1" type="field" name="label_y"/>
-          <column hidden="0" width="-1" type="field" name="label_rota"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14074,15 +14710,15 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14090,7 +14726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14156,7 +14792,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14181,374 +14817,374 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,158,23,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,158,23,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="0.80000000000000004" fontSize="7" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="7" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="196,60,57,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="196,60,57,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MapUnit" placement="3" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="3" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="4" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="0.29999999999999999" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="5" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="1" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" priority="3" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="3" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="4" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="5" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.29999999999999999" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="always_sho" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="&quot;&quot;" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="Priority" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="Show" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14556,16 +15192,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14576,8 +15212,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14586,8 +15222,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14631,8 +15267,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14695,22 +15331,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias name="" index="0" field="osm_id"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="highway"/>
+        <alias name="" index="3" field="waterway"/>
+        <alias name="" index="4" field="aerialway"/>
+        <alias name="" index="5" field="barrier"/>
+        <alias name="" index="6" field="man_made"/>
+        <alias name="" index="7" field="z_order"/>
+        <alias name="" index="8" field="other_tags"/>
+        <alias name="" index="9" field="never_show"/>
+        <alias name="" index="10" field="label_x"/>
+        <alias name="" index="11" field="label_y"/>
+        <alias name="" index="12" field="label_rota"/>
+        <alias name="" index="13" field="always_sho"/>
+        <alias name="" index="14" field="resident_a"/>
+        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="osm_id"/>
@@ -14749,64 +15385,64 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="highway" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="waterway" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="aerialway" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="barrier" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="man_made" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="other_tags" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="never_show" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="always_sho" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="resident_a" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="highway" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="waterway" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aerialway" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="never_show" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="always_sho" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="resident_a" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_show" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="osm_id"/>
-          <column hidden="0" width="160" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="z_order"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="highway"/>
-          <column hidden="0" width="-1" type="field" name="waterway"/>
-          <column hidden="0" width="-1" type="field" name="aerialway"/>
-          <column hidden="0" width="-1" type="field" name="barrier"/>
-          <column hidden="0" width="-1" type="field" name="man_made"/>
-          <column hidden="0" width="175" type="field" name="other_tags"/>
-          <column hidden="0" width="-1" type="field" name="never_show"/>
-          <column hidden="0" width="-1" type="field" name="label_x"/>
-          <column hidden="0" width="-1" type="field" name="label_y"/>
-          <column hidden="0" width="-1" type="field" name="label_rota"/>
-          <column hidden="0" width="-1" type="field" name="always_sho"/>
-          <column hidden="0" width="-1" type="field" name="resident_a"/>
-          <column hidden="0" width="-1" type="field" name="auxiliary_storage_labeling_show"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="160" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="175" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14874,58 +15510,58 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="aerialway"/>
-        <field reuseLastValue="0" name="always_sho"/>
-        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
-        <field reuseLastValue="0" name="barrier"/>
-        <field reuseLastValue="0" name="highway"/>
-        <field reuseLastValue="0" name="label_rota"/>
-        <field reuseLastValue="0" name="label_x"/>
-        <field reuseLastValue="0" name="label_y"/>
-        <field reuseLastValue="0" name="man_made"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="never_show"/>
-        <field reuseLastValue="0" name="osm_id"/>
-        <field reuseLastValue="0" name="other_tags"/>
-        <field reuseLastValue="0" name="resident_a"/>
-        <field reuseLastValue="0" name="waterway"/>
-        <field reuseLastValue="0" name="z_order"/>
+        <field name="aerialway" reuseLastValue="0"/>
+        <field name="always_sho" reuseLastValue="0"/>
+        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
+        <field name="barrier" reuseLastValue="0"/>
+        <field name="highway" reuseLastValue="0"/>
+        <field name="label_rota" reuseLastValue="0"/>
+        <field name="label_x" reuseLastValue="0"/>
+        <field name="label_y" reuseLastValue="0"/>
+        <field name="man_made" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="never_show" reuseLastValue="0"/>
+        <field name="osm_id" reuseLastValue="0"/>
+        <field name="other_tags" reuseLastValue="0"/>
+        <field name="resident_a" reuseLastValue="0"/>
+        <field name="waterway" reuseLastValue="0"/>
+        <field name="z_order" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -14975,7 +15611,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15041,7 +15677,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15066,145 +15702,145 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="231,113,72,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="231,113,72,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
           <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
@@ -15214,363 +15850,363 @@ def my_form_open(dialog, layer, feature):
           <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="star" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.5" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="name" type="QString" value="star"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.5"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,32,80,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,32,80,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/road_closure.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/road_closure.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,12,254,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="255,255,255,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,12,254,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="255,255,255,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <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>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <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="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" 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="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <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>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <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>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <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>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <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="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <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="spec" type="QString" value="rgb"/>
+                    <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>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="5" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="43,153,41,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="43,153,41,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15579,183 +16215,183 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="0.90000000000000002" fontSize="10" multilineHeightUnit="Percentage" fieldName="name" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="2" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOpacity="0.69999999999999996" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="2" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="2" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeRadiiY="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelDistance">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelDistance" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="OffsetQuad">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="2" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                  <Option name="OffsetQuad" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="2"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="1" centroidWhole="0" dist="3" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="2" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="3" xOffset="2" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="10" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="2" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="3" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="3" xOffset="2" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="2" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15763,16 +16399,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15809,10 +16445,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -15827,28 +16463,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15886,10 +16522,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -15897,7 +16533,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -15971,246 +16607,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" pass="0" enabled="1" locked="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
+            <layer locked="0" pass="0" enabled="1" class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
               <Option type="Map">
-                <Option value="135" type="QString" name="angle"/>
-                <Option value="during_render" type="QString" name="clip_mode"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="feature" type="QString" name="coordinate_reference"/>
-                <Option value="2" type="QString" name="distance"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
-                <Option value="MM" type="QString" name="distance_unit"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="135"/>
+                <Option name="clip_mode" type="QString" value="during_render"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="coordinate_reference" type="QString" value="feature"/>
+                <Option name="distance" type="QString" value="2"/>
+                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="distance_unit" type="QString" value="MM"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <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="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="@0@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="line">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="align_dash_pattern"/>
-                    <Option value="square" type="QString" name="capstyle"/>
-                    <Option value="5;2" type="QString" name="customdash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="customdash_unit"/>
-                    <Option value="0" type="QString" name="dash_pattern_offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                    <Option value="0" type="QString" name="draw_inside_polygon"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="211,134,33,255" type="QString" name="line_color"/>
-                    <Option value="solid" type="QString" name="line_style"/>
-                    <Option value="0.3" type="QString" name="line_width"/>
-                    <Option value="MM" type="QString" name="line_width_unit"/>
-                    <Option value="0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0" type="QString" name="ring_filter"/>
-                    <Option value="0" type="QString" name="trim_distance_end"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                    <Option value="0" type="QString" name="trim_distance_start"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                    <Option value="0" type="QString" name="use_custom_dash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                    <Option name="align_dash_pattern" type="QString" value="0"/>
+                    <Option name="capstyle" type="QString" value="square"/>
+                    <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="bevel"/>
+                    <Option name="line_color" type="QString" value="211,134,33,255"/>
+                    <Option name="line_style" type="QString" value="solid"/>
+                    <Option name="line_width" type="QString" value="0.3"/>
+                    <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.46" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="no" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.46"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="no"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16221,66 +16857,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16288,16 +16924,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="1" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16313,7 +16949,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="FID"/>
@@ -16322,20 +16958,20 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="FID" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="FID" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="FID" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="431" type="field" name="type"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16371,8 +17007,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16380,7 +17016,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -16446,7 +17082,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16471,612 +17107,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,207,80,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="190,207,80,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open"/>
-          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking"/>
-          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed"/>
-          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way"/>
-          <rule symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures"/>
+          <rule label="Road Open" symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule label="No Parking" symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule label="Lane Closed" symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule label="One-Way" symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule label="Road Closures" symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="2" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="2"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,255,0,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="2;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash dot dot" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="2;1;1;1"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{07696f80-e7db-403b-b380-82695a86ae34}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="3;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="3;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="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e24fa060-35e4-4c51-b944-426558636610}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17085,151 +17721,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" fieldName="times" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="times" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{27379576-e711-4788-850d-75df56ba927b}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17237,16 +17873,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17283,10 +17919,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="status"/>
+        <alias name="" index="3" field="times"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -17301,28 +17937,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="times" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="status" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="times" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="status" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="times" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="202" type="field" name="type"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="status"/>
-          <column hidden="0" width="-1" type="field" name="times"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17360,10 +17996,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17371,7 +18007,1494 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+      <extent>
+        <xmin>18.37568387427754857</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.9003177544488068</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37568387427754857</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.9003177544488068</ymax>
+      </wgs84extent>
+      <id>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>route_markers</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <dates/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="">memory</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <metadataUrls/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
+              <Option type="Map">
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <labeling type="rule-based">
+        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
+            <settings calloutType="simple">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <families/>
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <Option type="Map">
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
+            <settings calloutType="simple">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <families/>
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <Option type="Map">
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                        <Option type="Map">
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="190,178,151,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                        <Option type="Map">
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+          </rule>
+        </rules>
+      </labeling>
+      <customproperties>
+        <Option type="Map">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+          </Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+          <axisSymbol>
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+        <properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field name="Name" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="begin" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="end" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="RouteLen" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Sort" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="quadrant" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
+        <alias name="" index="10" field="org_fid"/>
+        <alias name="" index="11" field="distance"/>
+        <alias name="" index="12" field="quadrant"/>
+      </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+        <policy policy="Duplicate" field="quadrant"/>
+      </splitPolicies>
+      <defaults>
+        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Sort" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="quadrant" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="quadrant" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="quadrant" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="quadrant" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath>.</editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
+      </editable>
+      <labelOnTop>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
+      </labelOnTop>
+      <reuseLastValue>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
+      </reuseLastValue>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+      <mapTip enabled="1">Text</mapTip>
+    </maplayer>
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.37569549706161354</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -17445,1020 +19568,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" description="List for legends">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" description="21KM">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" description="10KM">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" description="5KM">
+            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="190,178,151,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="190,178,151,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" description="Trail">
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -18468,68 +20591,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18537,16 +20660,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18557,8 +20680,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18567,8 +20690,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18577,8 +20700,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18587,8 +20710,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18597,8 +20720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18621,8 +20744,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18631,8 +20754,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18641,8 +20764,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18651,8 +20774,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18661,26 +20784,26 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="begin" index="1" name=""/>
-        <alias field="end" index="2" name=""/>
-        <alias field="Distance" index="3" name=""/>
-        <alias field="RouteLen" index="4" name=""/>
-        <alias field="Sort" index="5" name=""/>
-        <alias field="day" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="length_m" index="9" name=""/>
-        <alias field="org_fid" index="10" name=""/>
-        <alias field="distance" index="11" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
+        <alias name="" index="10" field="org_fid"/>
+        <alias name="" index="11" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -18711,55 +20834,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="org_fid"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="0" width="-1" type="field" name="Source"/>
-          <column hidden="0" width="-1" type="field" name="RouteLen"/>
-          <column hidden="0" width="-1" type="field" name="descriptio"/>
-          <column hidden="0" width="-1" type="field" name="timestamp"/>
-          <column hidden="0" width="-1" type="field" name="begin"/>
-          <column hidden="0" width="-1" type="field" name="end"/>
-          <column hidden="0" width="-1" type="field" name="Distance"/>
-          <column hidden="0" width="-1" type="field" name="length_km"/>
-          <column hidden="0" width="-1" type="field" name="Sort"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="quadrant"/>
-          <column hidden="0" width="-1" type="field" name="length_m"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="quadrant" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18808,1562 +20931,45 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
-      <extent>
-        <xmin>18.37567806397844095</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37567806397844095</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </wgs84extent>
-      <id>route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <dates/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option value="" type="QString" name="name"/>
-            <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
-              <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
-              <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
-              <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
-      <labeling type="rule-based">
-        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
-            <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
-            <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" description="List for legends">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" description="21KM">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" description="10KM">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" description="5KM">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="190,178,151,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" description="Trail">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
-          </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
-          <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
-                <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
-        <properties>
-          <Option type="Map">
-            <Option value="" type="QString" name="name"/>
-            <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Sort" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="quadrant" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
-      </aliases>
-      <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-        <policy policy="Duplicate" field="quadrant"/>
-      </splitPolicies>
-      <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="quadrant" exp_strength="0" constraints="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
-        <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="org_fid"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="0" width="-1" type="field" name="Source"/>
-          <column hidden="0" width="-1" type="field" name="RouteLen"/>
-          <column hidden="0" width="-1" type="field" name="descriptio"/>
-          <column hidden="0" width="-1" type="field" name="timestamp"/>
-          <column hidden="0" width="-1" type="field" name="begin"/>
-          <column hidden="0" width="-1" type="field" name="end"/>
-          <column hidden="0" width="-1" type="field" name="Distance"/>
-          <column hidden="0" width="-1" type="field" name="length_km"/>
-          <column hidden="0" width="-1" type="field" name="Sort"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="quadrant"/>
-          <column hidden="0" width="-1" type="field" name="length_m"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
-      </editable>
-      <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
-      </labelOnTop>
-      <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip enabled="1">Text</mapTip>
-    </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -20437,173 +21043,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20614,18 +21220,18 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -20655,9 +21261,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="area"/>
+        <alias name="" index="2" field="rotation"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -20670,25 +21276,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="rotation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="area" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="rotation" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="area" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="rotation" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="area"/>
-          <column hidden="0" width="-1" type="field" name="rotation"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20711,7 +21317,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -20777,7 +21383,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20802,195 +21408,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
+          <rule label="All distances" symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
+            <layer locked="1" pass="0" enabled="1" class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,0"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21002,70 +21608,70 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="StringList" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21073,16 +21679,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21114,8 +21720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21131,8 +21737,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21141,8 +21747,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21191,19 +21797,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="RouteLen"/>
+        <alias name="" index="6" field="Source"/>
+        <alias name="" index="7" field="length_m"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="org_fid"/>
+        <alias name="" index="10" field="distance"/>
+        <alias name="" index="11" field="first_runn"/>
+        <alias name="" index="12" field="last_runne"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -21236,55 +21842,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="last_runne" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="first_runn" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="last_runne" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="descriptio" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="timestamp" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="first_runn" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="last_runne" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="179" type="field" name="begin"/>
-          <column hidden="0" width="-1" type="field" name="RouteLen"/>
-          <column hidden="0" width="-1" type="field" name="Source"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="0" width="-1" type="field" name="length_m"/>
-          <column hidden="0" width="-1" type="field" name="length_km"/>
-          <column hidden="0" width="-1" type="field" name="org_fid"/>
-          <column hidden="0" width="-1" type="field" name="first_runn"/>
-          <column hidden="0" width="-1" type="field" name="last_runne"/>
-          <column hidden="0" width="-1" type="field" name="descriptio"/>
-          <column hidden="0" width="-1" type="field" name="timestamp"/>
-          <column hidden="0" width="-1" type="field" name="end"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="first_runn" hidden="0" type="field"/>
+          <column width="-1" name="last_runne" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21343,31 +21949,31 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runne"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21375,7 +21981,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -21449,326 +22055,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -21781,66 +22387,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21848,16 +22454,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21880,8 +22486,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -21892,22 +22498,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21943,8 +22549,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21952,7 +22558,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22026,291 +22632,291 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="1" fontSize="15" multilineHeightUnit="Percentage" fieldName="label" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="15" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22318,16 +22924,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22350,8 +22956,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="label"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -22362,22 +22968,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="label" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="label"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22413,8 +23019,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22422,7 +23028,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -22488,7 +23094,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22513,267 +23119,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="8" multilineHeightUnit="Percentage" fieldName="label" multilineHeight="1" fontWeight="75" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Bold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="31,120,180,255">
+              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="31,120,180,255" forcedBold="0" multilineHeight="1" namedStyle="Bold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="0.75" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeOpacity="0.59999999999999998" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeOffsetY="-0.14999999999999999" shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.75">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="0.75" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,204" shapeOffsetUnit="MM" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeJoinStyle="64" shapeSizeY="0.29999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,204" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.75" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,204"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="31,120,206,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.75"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="0" centroidWhole="1" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="1" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="1" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="0.76000000000000001" obstacleType="0" zIndex="5" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="6" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="1" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" dist="0" xOffset="1" lineAnchorClipping="0" distUnits="MM" layerType="PolygonGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="6" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.76000000000000001" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -22782,72 +23388,72 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22855,22 +23461,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -22881,8 +23487,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22891,8 +23497,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22901,8 +23507,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22923,11 +23529,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="table_set"/>
+        <alias name="" index="2" field="label"/>
+        <alias name="" index="3" field="races"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -22944,31 +23550,31 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="table_set" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="races" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="table_set" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="races" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="table_set"/>
-          <column hidden="0" width="-1" type="field" name="label"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="130" type="field" name="races"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23007,18 +23613,18 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="label"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="table_set"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="label" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="table_set" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -23052,8 +23658,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
     <layer id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+    <layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
+    <layer id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -23222,7 +23829,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230907 - Gun Run 2023 - Marshal Plan 1.4.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230907 - Gun Run 2023 - Marshal Plan 1.5.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -23391,367 +23998,319 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" type="QString" name="name"/>
+      <Option name="name" type="QString" value=""/>
       <Option name="properties"/>
-      <Option value="collection" type="QString" name="type"/>
+      <Option name="type" type="QString" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer visible="1" expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Cones" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
+      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Fencing" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - inset" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - main" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal plan" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+    <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
+      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
       <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
+      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer visible="1" expanded="1" style="default" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+      <expanded-legend-nodes id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -23774,90 +24333,90 @@ def my_form_open(dialog, layer, feature):
     </contact>
     <links/>
     <dates>
-      <date value="2000-01-01T00:00:00" type="Created"/>
+      <date type="Created" value="2000-01-01T00:00:00"/>
     </dates>
     <author>Timothy Allen</author>
     <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" units="mm" name="Marshals" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Marshals" printResolution="120" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23865,15 +24424,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="132.391,187.018,mm" id="" opacity="1" referencePoint="0" sectionWidth="132.391" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="184.8" outlineWidthM="0.3,mm" zValue="6" frame="false" positionOnPage="158.226,6.0007,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" position="158.226,6.0007,mm" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" id="" positionLock="true" zValue="6" position="158.226,6.0007,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="184.8" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="132.391" excludeFromExports="0" positionOnPage="158.226,6.0007,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="132.391,187.018,mm" itemRotation="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23881,15 +24440,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="20.4703,32.2333,mm" id="" title="" zValue="5" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionOnPage="128.508,3.98741,mm" blendMode="0" referencePoint="0" frameJoinStyle="bevel" minSymbolSize="0" positionLock="true" outlineWidthM="0.1,mm" maxSymbolSize="0" columnSpace="2" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" position="128.508,3.98741,mm" columnCount="1">
-        <FrameColor blue="128" green="128" alpha="255" red="128"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="5" resizeToContents="1" frame="true" blendMode="0" positionOnPage="128.508,3.98741,mm" size="20.4703,32.2333,mm" background="true" groupUuid="" frameJoinStyle="bevel" position="128.508,3.98741,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="128" alpha="255" green="128" blue="128"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23900,242 +24459,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="11" multilineHeightUnit="MM" multilineHeight="4.8805579999999997" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.8805579999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="MM" multilineHeight="4.1750019999999992" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="1" name="subgroup" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.1750019999999992" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbol" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="8" multilineHeightUnit="MM" multilineHeight="3.8222239999999998" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="3.8222239999999998" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -24145,17 +24704,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -24163,166 +24722,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.5192,54.5647,mm" id="Inset map" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.2,mm" mapRotation="0" isTemporal="0" zValue="3" frame="true" positionOnPage="98.7828,149.027,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal map - inset" position="98.7828,149.027,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Inset map" positionLock="true" zValue="3" isTemporal="0" followPreset="true" mapRotation="0" position="98.7828,149.027,mm" blendMode="0" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.2,mm" excludeFromExports="0" positionOnPage="98.7828,149.027,mm" followPresetName="Marshal map - inset" type="65639" size="56.5192,54.5647,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3917833749645645" ymax="-33.90659215121308279" ymin="-33.91073582826823696" xmax="18.39607548048533303"/>
+        <Extent xmax="18.39607548048533303" xmin="18.3917833749645645" ymin="-33.91073582826823696" ymax="-33.90659215121308279"/>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24330,34 +24889,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="1" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" blendMode="0" position="3" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" show="1">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,65,170,127" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,102" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,65,170,127"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,102"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24365,9 +24924,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24377,171 +24936,171 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="142,187.018,mm" id="Main map" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="2" frame="false" positionOnPage="3.53,6.0007,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal map - main" position="3.53,6.0007,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Main map" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="3.53,6.0007,mm" blendMode="0" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.53,6.0007,mm" followPresetName="Marshal map - main" type="65639" size="142,187.018,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39341592405077463" ymax="-33.90798769129818879" ymin="-33.90934028818313095" xmax="18.3944429313991229"/>
+        <Extent xmax="18.3944429313991229" xmin="18.39341592405077463" ymin="-33.90934028818313095" ymax="-33.90798769129818879"/>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24551,26 +25110,26 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="47.1065,27.6,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../GunRun2023_500.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="1" frame="false" positionOnPage="246.665,178.41,mm" itemRotation="0" position="246.665,178.41,mm" pictureWidth="47.1065" groupUuid="" pictureHeight="26.6623" anchorPoint="0" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="26.6623" zValue="1" anchorPoint="0" northMode="0" pictureRotation="0" position="246.665,178.41,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="246.665,178.41,mm" pictureWidth="47.1065" type="65640" size="47.1065,27.6,mm" file="../GunRun2023_500.png" itemRotation="0" resizeMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24578,14 +25137,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" resizeMode="0" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
         <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24595,112 +25154,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="bool" name="imageAntialias"/>
-          <Option value="0" type="int" name="imageCropMarginBottom"/>
-          <Option value="0" type="int" name="imageCropMarginLeft"/>
-          <Option value="0" type="int" name="imageCropMarginRight"/>
-          <Option value="0" type="int" name="imageCropMarginTop"/>
-          <Option value="0" type="QString" name="imageCropMarginUnit"/>
-          <Option value="false" type="bool" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="rasterize"/>
-          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
-          <Option value="false" type="bool" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="bool" value="true"/>
+          <Option name="imageCropMarginBottom" type="int" value="0"/>
+          <Option name="imageCropMarginLeft" type="int" value="0"/>
+          <Option name="imageCropMarginRight" type="int" value="0"/>
+          <Option name="imageCropMarginTop" type="int" value="0"/>
+          <Option name="imageCropMarginUnit" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="bool" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="false"/>
+          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
+          <Option name="singleFile" type="bool" value="false"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" pageNameExpression="&quot;position&quot;" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerName="marshal_positions" hideCoverage="0" sortKey="&quot;id&quot;"/>
+      <Atlas coverageLayerName="marshal_positions" filterFeatures="0" sortKey="&quot;id&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" pageNameExpression="&quot;position&quot;" enabled="1" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" name="Start &amp; Finish Backgrounds" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24708,21 +25267,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="330" size="9.45865,11,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" file="arrows/NorthArrow_11.svg" resizeMode="0" svgBorderWidth="0.2" mode="0" zValue="4" frame="false" positionOnPage="286.027,2,mm" itemRotation="0" position="286.027,2,mm" pictureWidth="6.31767" groupUuid="" pictureHeight="7.97477" anchorPoint="0" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="0" id="" positionLock="true" pictureHeight="7.97477" zValue="4" anchorPoint="0" northMode="0" pictureRotation="330" position="286.027,2,mm" blendMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="286.027,2,mm" pictureWidth="6.31767" type="65640" size="9.45865,11,mm" file="arrows/NorthArrow_11.svg" itemRotation="0" resizeMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24730,476 +25289,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="142.543,10.3185,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="3" frame="false" marginX="1" positionOnPage="285.027,205.886,mm" labelText="[%upper( &quot;area&quot; )%]" itemRotation="270" position="285.027,205.886,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="3" marginY="1" position="285.027,205.886,mm" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" referencePoint="0" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="285.027,205.886,mm" type="65641" htmlState="0" size="142.543,10.3185,mm" itemRotation="270" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" itemRotation="0" height="3" unitLabel="m" numSegments="4" alignment="0" size="145.54,16.2165,mm" id="" unitType="meters" zValue="2" subdivisionsHeight="1.5" labelBarSpace="3" positionOnPage="7,189.669,mm" labelHorizontalPlacement="0" blendMode="0" referencePoint="0" segmentMillimeters="26.3519" numUnitsPerSegment="100" frameJoinStyle="miter" style="Single Box" labelVerticalPlacement="0" positionLock="true" segmentSizeMode="1" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" background="false" lineJoinStyle="miter" boxContentSpace="1" numSubdivisions="1" excludeFromExports="0" opacity="1" maxBarWidth="150" numSegmentsLeft="2" visibility="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" minBarWidth="50" outlineWidth="0.3" frame="false" lineCapStyle="square" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="miter" numUnitsPerSegment="100" unitLabel="m" lineCapStyle="square" unitType="meters" height="3" labelBarSpace="3" positionLock="true" minBarWidth="50" labelVerticalPlacement="0" numSegments="4" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelHorizontalPlacement="0" segmentMillimeters="26.3519" style="Single Box" referencePoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="7,189.669,mm" size="145.54,16.2165,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.3" frameJoinStyle="miter" position="7,189.669,mm" visibility="1" excludeFromExports="0" boxContentSpace="1" subdivisionsHeight="1.5" alignment="0" maxBarWidth="150">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" alpha="255" red="0"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="invalid" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option type="invalid" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" alpha="255" red="0"/>
-        <fillColor2 blue="255" green="255" alpha="255" red="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="278.027,180.318,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="330" isTemporal="0" zValue="1" frame="false" positionOnPage="7,5.5,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Start/Finish" position="7,5.5,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="330" position="7,5.5,mm" blendMode="0" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="7,5.5,mm" followPresetName="Start/Finish" type="65639" size="278.027,180.318,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="rotation" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="id" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
+        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="5" annotationFormat="4" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="3" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" unit="1" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="5" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25216,58 +25775,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25277,115 +25836,115 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
-          <Option value="0" type="QString" name="svgCropMarginBottom"/>
-          <Option value="0" type="QString" name="svgCropMarginLeft"/>
-          <Option value="0" type="QString" name="svgCropMarginRight"/>
-          <Option value="0" type="QString" name="svgCropMarginTop"/>
-          <Option value="true" type="QString" name="svgCropToContents"/>
-          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
-          <Option value="false" type="QString" name="svgGroupLayers"/>
-          <Option value="1" type="QString" name="svgIncludeMetadata"/>
-          <Option value="0" type="QString" name="svgTextFormat"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
+          <Option name="svgCropMarginBottom" type="QString" value="0"/>
+          <Option name="svgCropMarginLeft" type="QString" value="0"/>
+          <Option name="svgCropMarginRight" type="QString" value="0"/>
+          <Option name="svgCropMarginTop" type="QString" value="0"/>
+          <Option name="svgCropToContents" type="QString" value="true"/>
+          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
+          <Option name="svgGroupLayers" type="QString" value="false"/>
+          <Option name="svgIncludeMetadata" type="QString" value="1"/>
+          <Option name="svgTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerName="start_finish_area" hideCoverage="1" sortKey="area"/>
+      <Atlas coverageLayerName="start_finish_area" filterFeatures="0" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" pageNameExpression="&quot;area&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" name="Fencing" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Cones" printResolution="300" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25393,15 +25952,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="38.1563,67.2879,mm" id="" title="" zValue="11" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionOnPage="256.808,5.21277,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="0" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" position="256.808,5.21277,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,67.2879,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25412,242 +25971,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="group" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -25657,33 +26216,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./fencing.shp|layername=fencing" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -25691,77 +26250,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="148.46,6.45211,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="10" frame="false" marginX="0" positionOnPage="6.76779,191.188,mm" labelText="FENCING: [% &quot;name&quot; %]" itemRotation="0" position="6.76779,191.188,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="CONES: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.3557,6.45237,mm" id="" opacity="1" referencePoint="0" sectionWidth="56.3557" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="5.76" outlineWidthM="0.3,mm" zValue="9" frame="false" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" position="182.723,191.188,mm" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25769,269 +26328,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="26.8205,6.82826,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="8" frame="false" marginX="0" positionOnPage="209.146,198.083,mm" labelText="REVISION 3.0" itemRotation="0" position="209.146,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="51.1638,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="62.6706,198.083,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" position="62.6706,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="6" marginY="0" position="116.805,198.083,mm" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="116.805,198.083,mm" type="65641" htmlState="0" size="64.7594,7.10512,mm" itemRotation="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="64.7594,7.10512,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="6" frame="false" marginX="0" positionOnPage="116.805,198.083,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" position="116.805,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="52.7903,7.07327,mm" itemRotation="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="52.7903,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="5" frame="false" marginX="0" positionOnPage="6.76779,198.083,mm" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" position="6.76779,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
-          <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="49.3143,29.8354,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../GunRun2022_250.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="243.098,175.353,mm" itemRotation="0" position="243.098,175.353,mm" pictureWidth="29.6535" groupUuid="" pictureHeight="29.8354" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26039,380 +26536,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="232.01,0.14328,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" position="6.91779,197.79,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem groupUuid="" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" itemRotation="0" height="2" unitLabel="m" numSegments="2" alignment="0" size="109.51,15.8378,mm" id="" unitType="meters" zValue="2" subdivisionsHeight="1.5" labelBarSpace="1" positionOnPage="6.76779,2.8482,mm" labelHorizontalPlacement="0" blendMode="0" referencePoint="0" segmentMillimeters="33.2496" numUnitsPerSegment="20" frameJoinStyle="miter" style="Double Box" labelVerticalPlacement="0" positionLock="true" segmentSizeMode="1" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" background="false" lineJoinStyle="round" boxContentSpace="0.2" numSubdivisions="1" excludeFromExports="0" opacity="1" maxBarWidth="100" numSegmentsLeft="2" visibility="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" minBarWidth="25" outlineWidth="0.2" frame="false" lineCapStyle="square" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="500" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelHorizontalPlacement="0" segmentMillimeters="30.2878" style="Double Box" referencePoint="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="104.399,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" alpha="255" red="0"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="invalid" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option type="invalid" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" alpha="255" red="0"/>
-        <fillColor2 blue="255" green="255" alpha="255" red="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="283.418,180.92,mm" id="" opacity="0.9" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Fencing" position="6.76779,9.35102,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40368928312333452" ymax="-33.90720180625849167" ymin="-33.90817940102677852" xmax="18.40522072458854552"/>
+        <Extent xmax="18.40002634434715745" xmin="18.35799642373467222" ymin="-33.94965747213089458" ymax="-33.92282769675949083"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -26427,92 +26924,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="5" annotationFormat="4" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="3" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" unit="1" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="5" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26529,58 +27026,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26590,19 +27087,19 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" url="" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" url="" resizeMode="0" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26612,250 +27109,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerName="fence_and_cone_groups" hideCoverage="1" sortKey="&quot;group&quot;"/>
+      <Atlas coverageLayerName="cone_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="9" offsetY="0"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="9" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="false" size="83.9998,10.4638,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="1" positionOnPage="4.43449,186.634,mm" labelText="Directions to Start of Race" itemRotation="0" position="4.43449,186.634,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="8" marginY="1" position="4.43449,186.634,mm" blendMode="0" labelText="Directions to Start of Race" referencePoint="0" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,186.634,mm" type="65641" htmlState="0" size="83.9998,10.4638,mm" itemRotation="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="14" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="48.2923,9.511,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="4.43449,197.498,mm" labelText="Gun Run" itemRotation="0" position="4.43449,197.498,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="7" marginY="1" position="4.43449,197.498,mm" blendMode="0" labelText="Gun Run" referencePoint="0" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,197.498,mm" type="65641" htmlState="0" size="48.2923,9.511,mm" itemRotation="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="0" symbolHeight="5" boxSpace="2" symbolWidth="9" titleAlignment="1" rasterBorderColor="0,0,0,255" size="59.0766,76,mm" id="" title="" zValue="6" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="10.096,10.8563,mm" blendMode="0" referencePoint="0" legendFilterByMap="1" frameJoinStyle="round" minSymbolSize="0" positionLock="false" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" position="10.096,10.8563,mm" columnCount="1">
-        <FrameColor blue="139" green="139" alpha="255" red="139"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="9" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="5" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="0" legendFilterByMap="1" positionLock="false" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="true" blendMode="0" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" background="true" groupUuid="" frameJoinStyle="round" position="10.096,10.8563,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="139" alpha="255" green="139" blue="139"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26866,242 +27363,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="16" multilineHeightUnit="MM" multilineHeight="7.6444479999999997" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="7.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="6.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="6.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="subgroup" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2.5" marginLeft="3">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="6.9388920000000001" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbolLabel" indent="0" marginLeft="3">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27111,32 +27608,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
+          <layer-tree-group expanded="1" name="Ask Me" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" type="QString" name="legend/title-style"/>
+                <Option name="legend/title-style" type="QString" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
-                  <Option value="Toilets" type="QString" name="legend/label-1"/>
-                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
-                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
-                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
-                  <Option value="Parking" type="QString" name="legend/label-5"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
+                  <Option name="legend/label-1" type="QString" value="Toilets"/>
+                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
+                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
+                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
+                  <Option name="legend/label-5" type="QString" value="Parking"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
-                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
-                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
+                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
+                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27144,145 +27641,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="27.7839,6.871,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="221.862,190.027,mm" labelText="REVISION 1.0" itemRotation="0" position="221.862,190.027,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="5" marginY="1" position="221.862,190.027,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="221.862,190.027,mm" type="65641" htmlState="0" size="27.7839,6.871,mm" itemRotation="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="51.6706,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="4" frame="false" marginX="1" positionOnPage="197.975,197.498,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="197.975,197.498,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="4" marginY="1" position="197.975,197.498,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="197.975,197.498,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" pictureRotation="0" size="42.9838,24.3824,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="3" frame="false" positionOnPage="249.646,179.724,mm" itemRotation="0" position="249.646,179.724,mm" pictureWidth="24.2337" groupUuid="" pictureHeight="24.3824" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="false" pictureHeight="24.3824" zValue="3" anchorPoint="4" northMode="0" pictureRotation="0" position="249.646,179.724,mm" blendMode="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="249.646,179.724,mm" pictureWidth="24.2337" type="65640" size="42.9838,24.3824,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27290,85 +27787,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="244.912,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="2" frame="false" shapeType="1" positionOnPage="4.58449,197.248,mm" itemRotation="0" position="4.58449,197.248,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="false" zValue="2" position="4.58449,197.248,mm" blendMode="0" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" type="65643" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" itemRotation="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{25dc84af-8724-465b-a42c-c6c013132998}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="288.007,183.616,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="4.43449,6.411,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Ask Me" position="4.43449,6.411,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="4.43449,6.411,mm" blendMode="0" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="4.43449,6.411,mm" followPresetName="Ask Me" type="65639" size="288.007,183.616,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
+        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -27383,149 +27880,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27535,316 +28032,316 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" sortFeatures="0" pageNameExpression="" filterFeatures="0" coverageLayer="" hideCoverage="0"/>
+      <Atlas filterFeatures="0" coverageLayer="" hideCoverage="0" pageNameExpression="" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Routes" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" name="Routes" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="61.5373,6.8714,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="13" frame="false" marginX="0" positionOnPage="200.171,199.082,mm" labelText="REVISION 1.5" itemRotation="0" position="200.171,199.082,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="13" marginY="0" position="200.171,199.082,mm" blendMode="0" labelText="REVISION 1.6" referencePoint="0" valign="32" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="200.171,199.082,mm" type="65641" htmlState="0" size="61.5373,6.8714,mm" itemRotation="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="61.5373,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="12" frame="false" marginX="0" positionOnPage="9.7863,192.073,mm" labelText="Gun Run 2023: [%&quot;Source&quot;%]" itemRotation="0" position="9.7863,192.073,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="12" marginY="0" position="9.7863,192.073,mm" blendMode="0" labelText="Gun Run 2023: [%&quot;Source&quot;%]" referencePoint="0" valign="64" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,192.073,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="61.5373,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="11" frame="false" marginX="0" positionOnPage="9.7863,199.082,mm" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" itemRotation="0" position="9.7863,199.082,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="11" marginY="0" position="9.7863,199.082,mm" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" referencePoint="0" valign="32" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,199.082,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="10" frame="false" positionOnPage="262.196,188.218,mm" itemRotation="0" position="262.196,188.218,mm" pictureWidth="29.7523" groupUuid="" pictureHeight="16.8993" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="16.8993" zValue="10" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="29.7523" type="65640" size="29.7523,17.4718,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27852,464 +28349,374 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="251.982,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="9" frame="false" shapeType="1" positionOnPage="9.57644,198.832,mm" itemRotation="0" position="9.57644,198.832,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="9" position="9.57644,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.57644,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" itemRotation="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="109.221,188.689,mm" id="Trail Finish" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="8" frame="true" positionOnPage="8.21644,4.09761,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="8.21644,4.09761,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Finish" positionLock="true" zValue="8" isTemporal="0" followPreset="true" mapRotation="0" position="8.21644,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="8.21644,4.09761,mm" followPresetName="Routes" type="65639" size="109.221,188.689,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" ymax="-33.90007966676468953" ymin="-33.93242806047424409" xmax="18.41187375074135701"/>
+        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93242806047424409" ymax="-33.90007966676468953"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="179.156,191.505,mm" id="Trail Start" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="7" frame="true" positionOnPage="113.002,2.39423,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="113.002,2.39423,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Start" positionLock="true" zValue="7" isTemporal="0" followPreset="true" mapRotation="0" position="113.002,2.39423,mm" blendMode="0" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="113.002,2.39423,mm" followPresetName="Routes" type="65639" size="179.156,191.505,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" ymax="-33.92465573363980269" ymin="-33.95791657202656921" xmax="18.42354248737832023"/>
+        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95791657202656921" ymax="-33.92465573363980269"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="67.7828,166.874,mm" id="Left inset 21KM" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="6" frame="true" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Routes" position="5.86559,4.09761,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Left inset 21KM" positionLock="true" zValue="6" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
+        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="113.3,76.1023,mm" id="Bottom inset 21KM" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="5" frame="true" positionOnPage="133.191,119.125,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="133.191,119.125,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true">
-        <FrameColor blue="144" green="34" alpha="255" red="103"/>
-        <BackgroundColor blue="215" green="175" alpha="255" red="200"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Bottom inset 21KM" positionLock="true" zValue="5" isTemporal="0" followPreset="true" mapRotation="0" position="131.391,120.702,mm" blendMode="0" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="131.391,120.702,mm" followPresetName="Routes" type="65639" size="113.3,76.1023,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true">
+        <FrameColor red="103" alpha="255" green="34" blue="144"/>
+        <BackgroundColor red="200" alpha="128" green="175" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
+        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
         <LayerSet/>
         <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="68.3676,117.12,mm" id="End inset Trail" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="4" frame="true" positionOnPage="19.6693,7.89412,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="19.6693,7.89412,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Main Map" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="8.14144,4.02261,mm" blendMode="0" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="8.14144,4.02261,mm" followPresetName="Routes" type="65639" size="282.732,188.839,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
+                </Option>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
+                </Option>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
+        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymin="-33.92600000000000193" ymax="-33.8918539481981469"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
-      </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="63.655,88.3012,mm" id="Start inset Trail" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="3" frame="true" positionOnPage="170.062,49.6297,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="170.062,49.6297,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-              </Option>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
-      </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="75.8756,69.7635,mm" id="Contour inset Trail" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="2" frame="true" positionOnPage="200.321,125.314,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="200.321,125.314,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" uuid="{917a530c-14f4-4ed8-b109-961939435221}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-              </Option>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
-      </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="282.732,188.839,mm" id="Main Map" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.15,mm" mapRotation="0" isTemporal="0" zValue="1" frame="true" positionOnPage="8.14144,4.02261,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="8.14144,4.02261,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="round" blendMode="0" type="65639" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.378'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-              </Option>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.37199999999999989" ymax="-33.89185394818929353" ymin="-33.92600000000000193" xmax="18.42312398090293613"/>
-        <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28317,40 +28724,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="0" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" blendMode="0" position="3" name="Overview 1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" show="1">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="alpha">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="alpha" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="103,34,144,26" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="103,34,144,26"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28358,9 +28765,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28370,113 +28777,113 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;" filterFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerName="all_routes" hideCoverage="0" sortKey="&quot;Sort&quot;"/>
+      <Atlas coverageLayerName="all_routes" filterFeatures="1" sortKey="&quot;Sort&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" enabled="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" coverageLayerProvider="ogr" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="120" units="mm" name="Marshal Plan A1" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Marshal Plan A1" printResolution="120" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="594,841,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="594,841,mm" itemRotation="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28484,15 +28891,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="4,4,mm" id="" title="" zValue="8" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionOnPage="25.5925,18.7971,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" position="25.5925,18.7971,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="8" resizeToContents="1" frame="false" blendMode="0" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" background="true" groupUuid="" frameJoinStyle="miter" position="25.5925,18.7971,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28503,242 +28910,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="16" multilineHeightUnit="MM" multilineHeight="6.6444479999999997" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="5.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="1" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbol" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -28748,17 +29155,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" checked="Qt::Checked" id="all_routes20170907054841602" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" checked="Qt::Checked" legend_exp="" id="all_routes20170907054841602">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="QString" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="QString" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28766,207 +29173,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="91.9494,15.0649,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="5.2963,808.939,mm" labelText="MARSHAL POSITIONS" itemRotation="0" position="5.2963,808.939,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.2963,808.939,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="5.2963,808.939,mm" type="65641" htmlState="0" size="91.9494,15.0649,mm" itemRotation="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.6212,15.3656,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="430.403,825.052,mm" labelText="REVISION 1.2" itemRotation="0" position="430.403,825.052,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="430.403,825.052,mm" blendMode="0" labelText="REVISION 1.2" referencePoint="0" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="430.403,825.052,mm" type="65641" htmlState="0" size="56.6212,15.3656,mm" itemRotation="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="114.848,15.0635,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="4" frame="false" marginX="1" positionOnPage="372.175,808.942,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="372.175,808.942,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="4" marginY="1" position="372.175,808.942,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="372.175,808.942,mm" type="65641" htmlState="0" size="114.848,15.0635,mm" itemRotation="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="100.498,63.9757,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="3" frame="false" positionOnPage="489.557,775.395,mm" itemRotation="0" position="489.557,775.395,mm" pictureWidth="63.5856" groupUuid="" pictureHeight="63.9757" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="63.9757" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="489.557,775.395,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="489.557,775.395,mm" pictureWidth="63.5856" type="65640" size="100.498,63.9757,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28974,199 +29381,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="481.428,0.606138,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="2" frame="false" shapeType="1" positionOnPage="5.4463,824.155,mm" itemRotation="0" position="5.4463,824.155,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.4463,824.155,mm" blendMode="0" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" type="65643" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" itemRotation="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="584.759,811.213,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="true" positionOnPage="3.94474,5.25965,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal plan" position="3.94474,5.25965,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="3.94474,5.25965,mm" blendMode="0" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.94474,5.25965,mm" followPresetName="Marshal plan" type="65639" size="584.759,811.213,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
+        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerName="complete_marshal_overview" hideCoverage="1" sortKey="page"/>
+      <Atlas coverageLayerName="complete_marshal_overview" filterFeatures="0" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Access Roads" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Access Roads" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="0" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="34.45,40.8,mm" id="" title="" zValue="15" positionOnPage="244.484,130.172,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" position="244.484,130.172,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="185" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="15" resizeToContents="1" frame="true" blendMode="0" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" background="true" groupUuid="" frameJoinStyle="miter" position="244.484,130.172,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="185" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29174,242 +29581,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="5.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="group" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29419,15 +29826,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
+          <layer-tree-group expanded="1" name="Residents Access" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29435,207 +29842,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="194.851,7.272,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="0" positionOnPage="9.37446,191.81,mm" labelText="ACCESS ROUTES FOR RESIDENTS" itemRotation="0" position="9.37446,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" referencePoint="0" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="14" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="57.4836,6.8714,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="6" frame="false" marginX="1" positionOnPage="204.225,191.81,mm" labelText="REVISION 1.1" itemRotation="0" position="204.225,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.1" referencePoint="0" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="51.6706,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="210.038,199.082,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="210.038,199.082,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="262.196,188.218,mm" itemRotation="0" position="262.196,188.218,mm" pictureWidth="17.3653" groupUuid="" pictureHeight="17.4718" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29643,100 +30050,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="251.959,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" position="9.59946,198.832,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="67.7828,166.874,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="2" frame="true" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Access Routes" position="5.86559,4.09761,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Access Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29751,149 +30158,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29903,43 +30310,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="282.012,175.592,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.15,mm" mapRotation="0" isTemporal="0" zValue="1" frame="true" positionOnPage="9.44946,9.08557,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Access Routes" position="9.44946,9.08557,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="round" blendMode="0" type="65639" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,9.08557,mm" followPresetName="Access Routes" type="65639" size="282.012,175.592,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
+        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29954,149 +30361,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30106,316 +30513,316 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" enabled="1" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" hideCoverage="1"/>
+      <Atlas coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="194.851,7.272,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="0" positionOnPage="9.37446,191.81,mm" labelText="Access to P9 Parking and VIP Tent" itemRotation="0" position="9.37446,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="Access to P9 Parking and VIP Tent" referencePoint="0" valign="64" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="14" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="57.4836,6.8714,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="6" frame="false" marginX="1" positionOnPage="204.225,191.81,mm" labelText="REVISION 1.0" itemRotation="0" position="204.225,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="64" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="51.6706,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="210.038,199.082,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="210.038,199.082,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="262.196,188.218,mm" itemRotation="0" position="262.196,188.218,mm" pictureWidth="17.3653" groupUuid="" pictureHeight="17.4718" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30423,85 +30830,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="251.959,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" position="9.59946,198.832,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{025604c1-b118-4f15-b140-54c9145260c4}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="282.012,182.649,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.15,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="9.44946,7.25098,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="" position="9.44946,7.25098,mm" labelMargin="0,mm" followPreset="false" groupUuid="" frameJoinStyle="round" blendMode="0" type="65639" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="false" mapRotation="0" position="9.44946,7.25098,mm" blendMode="0" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frame="false" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,7.25098,mm" followPresetName="" type="65639" size="282.012,182.649,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
+        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30516,149 +30923,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30668,106 +31075,106 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" enabled="0" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" hideCoverage="1"/>
+      <Atlas coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="120" units="mm" name="Marshal Plan" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Marshal Plan" printResolution="120" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,420,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,420,mm" itemRotation="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30775,15 +31182,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="23.5967,8.3142,mm" id="" opacity="1" referencePoint="0" sectionWidth="23.5967" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="8.3142" outlineWidthM="0.3,mm" zValue="9" frame="false" positionOnPage="112.086,406.476,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" position="112.086,406.476,mm" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" id="" positionLock="true" zValue="9" position="112.086,406.476,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="8.3142" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="23.5967" excludeFromExports="0" positionOnPage="112.086,406.476,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="23.5967,8.3142,mm" itemRotation="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30791,139 +31198,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="27.7839,7.51682,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="0" positionOnPage="214.292,406.874,mm" labelText="REVISION 1.4" itemRotation="0" position="214.292,406.874,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="1" position="214.292,406.874,mm" blendMode="0" labelText="REVISION 1.4" referencePoint="0" valign="32" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="214.292,406.874,mm" type="65641" htmlState="0" size="27.7839,7.51682,mm" itemRotation="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="45.1194,8.13137,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="0" positionOnPage="5.69321,398.344,mm" labelText="MARSHAL POSITIONS" itemRotation="0" position="5.69321,398.344,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.69321,398.344,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="5.69321,398.344,mm" type="65641" htmlState="0" size="45.1194,8.13137,mm" itemRotation="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="22.2406,33.2917,mm" id="" title="" zValue="6" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionOnPage="15.6525,12.5708,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" frame="false" position="15.6525,12.5708,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="false" blendMode="0" positionOnPage="15.6525,12.5708,mm" size="22.2406,33.2917,mm" background="true" groupUuid="" frameJoinStyle="miter" position="15.6525,12.5708,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30934,242 +31341,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="16" multilineHeightUnit="MM" multilineHeight="6.6444479999999997" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="5.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="1" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbol" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -31179,19 +31586,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="group" type="QString" name="legend/title-style"/>
+                <Option name="legend/title-style" type="QString" value="group"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31199,15 +31606,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="118.192,7.80192,mm" id="" opacity="1" referencePoint="0" sectionWidth="118.192" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="7.80192" outlineWidthM="0.3,mm" zValue="5" frame="false" positionOnPage="5.69321,406.988,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" position="5.69321,406.988,mm" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" id="" positionLock="true" zValue="5" position="5.69321,406.988,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.80192" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="118.192" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="118.192,7.80192,mm" itemRotation="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31215,15 +31622,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="93.5757,8.13167,mm" id="" opacity="1" referencePoint="0" sectionWidth="93.5757" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="8.13167" outlineWidthM="0.3,mm" zValue="4" frame="false" positionOnPage="148.501,398.344,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" position="148.501,398.344,mm" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" id="" positionLock="true" zValue="4" position="148.501,398.344,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="8.13167" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="93.5757" excludeFromExports="0" positionOnPage="148.501,398.344,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="93.5757,8.13167,mm" itemRotation="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31231,21 +31638,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="49.3143,31.2967,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../../Gun Run 2023.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="3" frame="false" positionOnPage="243.319,382.696,mm" itemRotation="0" position="243.319,382.696,mm" pictureWidth="49.3143" groupUuid="" pictureHeight="27.9119" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="27.9119" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="243.319,382.696,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.319,382.696,mm" pictureWidth="49.3143" type="65640" size="49.3143,31.2967,mm" file="../../Gun Run 2023.png" itemRotation="0" resizeMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31253,101 +31660,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="236.083,0.14328,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="2" frame="false" shapeType="1" positionOnPage="5.84321,406.626,mm" itemRotation="0" position="5.84321,406.626,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.84321,406.626,mm" blendMode="0" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" type="65643" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" itemRotation="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="286.94,392.396,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="5.03,5.9483,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal plan" position="5.03,5.9483,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="5.03,5.9483,mm" blendMode="0" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.03,5.9483,mm" followPresetName="Marshal plan" type="65639" size="286.94,392.396,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36924763341120581" ymax="-33.92487327745350001" ymin="-33.94797288016832937" xmax="18.38613924055453452"/>
+        <Extent xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016832226" ymax="-33.9248732774534929"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutMultiFrame html="Page [% &quot;page&quot; %] " maxBreakDistance="10" evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" url="" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" url="" resizeMode="0" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" contentMode="1" html="Page [% &quot;page&quot; %] " maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
         <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31355,14 +31762,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" url="" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" url="" resizeMode="0" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
         <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31370,14 +31777,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" url="" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" url="" resizeMode="0" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31387,99 +31794,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerName="marshal_overviews" hideCoverage="1" sortKey="page"/>
+      <Atlas coverageLayerName="marshal_overviews" filterFeatures="0" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" name="Fencing - Cones only" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Fencing" printResolution="300" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31487,15 +31894,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="38.1563,53.7608,mm" id="" title="" zValue="11" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" positionOnPage="256.808,5.21277,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="0" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" frame="true" position="256.808,5.21277,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,68.0108,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31506,242 +31913,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="group" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -31751,33 +32158,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./fencing.shp|layername=fencing" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31785,77 +32192,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="148.46,6.45211,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="10" frame="false" marginX="0" positionOnPage="6.76779,191.188,mm" labelText="CONES: [% &quot;name&quot; %]" itemRotation="0" position="6.76779,191.188,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.3557,6.45237,mm" id="" opacity="1" referencePoint="0" sectionWidth="56.3557" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="5.76" outlineWidthM="0.3,mm" zValue="9" frame="false" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" position="182.723,191.188,mm" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31863,269 +32270,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="26.8205,6.82826,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="8" frame="false" marginX="0" positionOnPage="209.146,198.083,mm" labelText="REVISION 3.0" itemRotation="0" position="209.146,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="51.1638,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="62.6706,198.083,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" position="62.6706,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="62.6706,198.083,mm" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="62.6706,198.083,mm" type="65641" htmlState="0" size="51.1638,7.07327,mm" itemRotation="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="64.7594,7.10512,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="6" frame="false" marginX="0" positionOnPage="116.805,198.083,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" position="116.805,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="90.2083,7.07327,mm" itemRotation="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="90.2083,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="5" frame="false" marginX="0" positionOnPage="6.76779,198.083,mm" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" position="6.76779,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
-          <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="49.3143,29.8354,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../GunRun2022_250.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="243.098,175.353,mm" itemRotation="0" position="243.098,175.353,mm" pictureWidth="29.6535" groupUuid="" pictureHeight="29.8354" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32133,380 +32478,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="232.01,0.14328,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" position="6.91779,197.79,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem groupUuid="" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" type="65646" itemRotation="0" height="2" unitLabel="m" numSegments="2" alignment="0" size="88.3204,15.8378,mm" id="" unitType="meters" zValue="2" subdivisionsHeight="1.5" labelBarSpace="1" positionOnPage="6.76779,2.8482,mm" labelHorizontalPlacement="0" blendMode="0" referencePoint="0" segmentMillimeters="26.1864" numUnitsPerSegment="30" frameJoinStyle="miter" style="Double Box" labelVerticalPlacement="0" positionLock="true" segmentSizeMode="1" outlineWidthM="0.3,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" background="false" lineJoinStyle="round" boxContentSpace="0.2" numSubdivisions="1" excludeFromExports="0" opacity="1" maxBarWidth="100" numSegmentsLeft="2" visibility="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" minBarWidth="25" outlineWidth="0.2" frame="false" lineCapStyle="square" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="20" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" labelHorizontalPlacement="0" segmentMillimeters="25.8173" style="Double Box" referencePoint="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="87.2133,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" alpha="255" red="0"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="invalid" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option type="invalid" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" alpha="255" red="0"/>
-        <fillColor2 blue="255" green="255" alpha="255" red="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ba8b697f-af10-49bc-b789-55678d099479}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="283.418,180.92,mm" id="" opacity="0.9" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Cones" position="6.76779,9.35102,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.38081056635935795" ymax="-33.91866254684331494" ymin="-33.92052446432401069" xmax="18.3837273348683965"/>
+        <Extent xmax="18.37821516684363488" xmin="18.37624285840067628" ymin="-33.94258732662760991" ymax="-33.94132830492694808"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32521,92 +32866,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="5" annotationFormat="4" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="3" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" unit="1" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="5" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -32623,58 +32968,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32684,19 +33029,19 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" url="" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" url="" resizeMode="0" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32706,30 +33051,30 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerName="cone_only_groups" hideCoverage="1" sortKey="&quot;group&quot;"/>
+      <Atlas coverageLayerName="fence_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
@@ -32737,7 +33082,7 @@ def my_form_open(dialog, layer, feature):
   <Sensors/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.38073251581242573" ymax="-33.91261403108947547" ymin="-33.92010227189385319" xmax="18.39453367306187204">
+    <DefaultViewExtent xmax="18.43564544749748535" xmin="18.38044081847287714" ymin="-33.91875794015667367" ymax="-33.88880497692461091">
       <spatialrefsys nativeFormat="Wkt">
         <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -32751,41 +33096,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" frameRate="1" timeStep="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings frameRate="1" timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="invalid" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="direction_format"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option type="invalid" name="thousand_separator"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
-        <Option type="invalid" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
-        <Option value="false" type="bool" name="show_leading_zeros"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="false" type="bool" name="show_suffix"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option type="invalid" name="thousand_separator"/>
+        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
+        <Option name="show_leading_zeros" type="bool" value="false"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_suffix" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
     <CoordinateCustomCrs>
@@ -32802,7 +33147,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" destinationFollowsActiveLayer="1" destinationLayerName="marshal_positions" autoAddTrackVertices="0" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" destinationLayerProvider="ogr" autoCommitFeatures="0">
+  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" destinationFollowsActiveLayer="1" autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayerProvider="memory" destinationLayer="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" destinationLayerName="route_markers">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 9bb8d59..40f9397 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.32.2-Lima" saveUser="tim" projectname="Gun Run" saveDateTime="2023-09-07T12:34:22" saveUserFull="Timothy Allen">
+<qgis saveUserFull="Timothy Allen" version="3.32.2-Lima" saveUser="tim" saveDateTime="2023-09-07T23:11:15" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,270 +17,255 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer combined-method="0" is-active="0" edl-distance-unit="0" edl-strength="1000" edl-is-active="1" hillshading-is-multidirectional="0" light-azimuth="315" edl-distance="0.5" hillshading-is-active="0" hillshading-z-factor="1" light-altitude="45"/>
+  <elevation-shading-renderer edl-distance-unit="0" edl-strength="1000" light-altitude="45" edl-distance="0.5" hillshading-is-active="0" combined-method="0" hillshading-is-multidirectional="0" edl-is-active="1" is-active="0" hillshading-z-factor="1" light-azimuth="315"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Marshals">
+    <layer-tree-group expanded="1" name="Marshals" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" name="marshal_positions" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions [456]" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./extra_security.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="extra_security20170921130834191" name="extra_security" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="extra_security" source="./extra_security.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="extra_security20170921130834191">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="delimitedtext" id="marshals_by_position20161003112326575" name="marshals_by_position" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_exp="" providerKey="delimitedtext" id="marshals_by_position20161003112326575">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position [457]" type="QString" name="cached_name"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" name="complete_marshal_overview" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" expanded="0" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" name="marshal_overviews" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51">
         <customproperties>
           <Option type="Map">
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
+    <layer-tree-group expanded="0" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./fencing.shp|layername=fencing" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" type="QString" name="cached_name"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" providerKey="virtual" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="cone_only_groups" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" name="fence_and_cone_groups" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+    <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
+      <layer-tree-group expanded="1" name="Markers" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer legend_split_behavior="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={7a8ff1d9-6814-40ca-b26c-2833d6a46353}" expanded="1" patch_size="-1,-1" checked="Qt::Checked" providerKey="memory" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" name="route_markers" legend_exp="">
+        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" checked="Qt::Checked" legend_exp="" providerKey="memory" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549">
           <customproperties>
             <Option type="Map">
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option name="showFeatureCount" type="int" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer legend_split_behavior="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)&amp;uid={1c25b21e-66a8-46a9-bcf9-b32d266b915e}" expanded="1" patch_size="-1,-1" checked="Qt::Unchecked" providerKey="memory" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" name="route_markers" legend_exp="">
+        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={458fbc48-5594-4b39-9810-4ac65744537d}" checked="Qt::Unchecked" legend_exp="" providerKey="memory" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02">
           <customproperties>
             <Option type="Map">
-              <Option type="invalid" name="expandedLegendNodes"/>
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option name="expandedLegendNodes"/>
+              <Option name="showFeatureCount" type="int" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="0" type="int" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes"/>
+            <Option name="showFeatureCount" type="int" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" expanded="0" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" name="timelapse" legend_exp="">
+    <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f">
       <customproperties>
-        <Option type="Map">
-          <Option value="timelapse" type="QString" name="cached_name"/>
-        </Option>
+        <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Feeding Stations">
+    <layer-tree-group expanded="1" name="Feeding Stations" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./water_tables.shp" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="water_tables20170921142016467" name="water_tables" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="water_tables" source="./water_tables.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="water_tables20170921142016467">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
+    <layer-tree-group expanded="0" name="Ask Me" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="poi_labels" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="directions_to_start" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./mayor.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" name="mayor" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="mayor" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./viplabels.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" name="viplabels" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="viplabels" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./vipaccess.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" name="vipaccess" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="vipaccess" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./golfaccess.shp" expanded="0" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" name="golfaccess" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="">
-        <customproperties>
-          <Option type="Map">
-            <Option value="residents_access_roads" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" name="residents_access" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
+    <layer-tree-group expanded="0" name="Residents Access" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./osm_roads.shp" expanded="0" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" name="osm_roads" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="mayor" source="./mayor.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="viplabels" source="./viplabels.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" name="osm_places" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="vipaccess" source="./vipaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="golfaccess" source="./golfaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="OSM data" groupLayer="" checked="Qt::Checked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="osm_roads" source="./osm_roads.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="osm_places" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
+    <layer-tree-group expanded="1" name="Start and Finish pages" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./data-comments.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" name="data-comments" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="data-comments" source="./data-comments.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="./start_finish_area.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" name="start_finish_area" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="start_finish_area" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
+    <layer-tree-group expanded="0" name="Elevation" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./capetownelevation-1m.shp" expanded="1" patch_size="0,0" checked="Qt::Unchecked" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" name="capetownelevation-1m" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="capetownelevation-1m" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
         <customproperties>
           <Option type="Map">
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
+    <layer-tree-group expanded="1" name="Map" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" expanded="0" patch_size="0,0" checked="Qt::Checked" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_exp="" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" name="Outlines" legend_exp="">
+      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="Outlines" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_exp="" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" type="QString" name="cached_name"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -311,37 +296,39 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43</item>
       <item>route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02</item>
+      <item>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</item>
+      <item>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings maxScale="0" tolerance="10" minScale="0" enabled="0" self-snapping="1" intersection-snapping="1" unit="1" scaleDependencyMode="0" type="1" mode="3">
+  <snapping-settings self-snapping="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" tolerance="10" enabled="0" maxScale="0" type="1" unit="1">
     <individual-layer-settings>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="0" minScale="0" enabled="0" id="water_tables20170921142016467" units="2" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="0" minScale="0" enabled="0" id="extra_security20170921130834191" units="2" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" type="0"/>
-      <layer-setting maxScale="0" tolerance="20" minScale="0" enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43" units="1" type="1"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" type="0"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" type="2"/>
-      <layer-setting maxScale="0" tolerance="12" minScale="0" enabled="0" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" units="1" type="1"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="water_tables20170921142016467"/>
+      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="extra_security20170921130834191"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+      <layer-setting minScale="0" tolerance="20" enabled="1" maxScale="0" type="2" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -349,10 +336,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.38450671881076914</xmin>
-      <ymin>-33.92010227189385319</ymin>
-      <xmax>18.39075947006352862</xmax>
-      <ymax>-33.91261403108947547</ymax>
+      <xmin>18.39553763047966228</xmin>
+      <ymin>-33.91875794015667367</ymin>
+      <xmax>18.42054863549070021</xmax>
+      <ymax>-33.88880497692461091</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -373,171 +360,176 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Checked" open="true" name="Marshals">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup open="true" name="Marshals" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshal_positions" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="extra_security" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshals_by_position" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="complete_marshal_overview" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="marshal_overviews" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Fencing and Cones">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="fencing" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fencing" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="cone_only_groups" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="cone_groups" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_and_cone_groups" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_groups" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+        </filegroup>
+      </legendlayer>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_and_cone_groups" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Routes">
-      <legendgroup checked="Qt::Checked" open="true" name="Markers">
-        <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+    <legendgroup open="true" name="Routes" checked="Qt::Checked">
+      <legendgroup open="true" name="Markers" checked="Qt::Checked">
+        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Checked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
           </filegroup>
         </legendlayer>
-        <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" visible="0" layerid="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
+        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Unchecked">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="all_routes" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0">
-      <filegroup hidden="false" open="false">
-        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+    <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="timelapse" checked="Qt::Unchecked">
+      <filegroup open="false" hidden="false">
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
+    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="water_tables" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="poi_labels" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="directions_to_start" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="mayor" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="mayor" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="viplabels" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="vipaccess" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="golfaccess" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access_roads" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="1" name="osm_roads" checked="Qt::Checked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="osm_places" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="data-comments" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="start_finish_area" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="capetownelevation-1m" checked="Qt::Unchecked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup open="true" name="Map" checked="Qt::Checked">
+      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="Outlines" checked="Qt::Checked">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer maxScale="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="0" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="annotation" autoRefreshTime="0">
+  <main-annotation-layer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="annotation">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -598,7 +590,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer maxScale="100000" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="raster" autoRefreshTime="0">
+    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="100000" type="raster">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -664,7 +656,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -675,9 +667,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -689,97 +681,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" band="1" zoffset="0" zscale="1" enabled="0">
+      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -788,28 +780,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Value" type="QString" name="identify/format"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Value"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer alphaBand="-1" blueBand="3" nodataColor="" greenBand="2" opacity="0.5" type="multibandcolor" redBand="1">
+        <rasterrenderer nodataColor="" opacity="0.5" blueBand="3" alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -821,13 +813,13 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" invertColors="0" colorizeRed="255" colorizeGreen="128" saturation="0" grayscaleMode="0"/>
+        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="raster" autoRefreshTime="0">
+    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="raster">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -893,7 +885,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -904,7 +896,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -916,97 +908,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" enabled="0" mode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" band="1" zoffset="0" zscale="1" enabled="0">
+      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1015,28 +1007,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Undefined" type="QString" name="identify/format"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Undefined"/>
         </Option>
       </customproperties>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer band="1" alphaBand="-1" nodataColor="" opacity="0.75" type="singlebandcolordata">
+        <rasterrenderer nodataColor="" opacity="0.75" alphaBand="-1" band="1" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1048,13 +1040,13 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeBlue="128" invertColors="0" colorizeRed="255" colorizeGreen="128" saturation="0" grayscaleMode="0"/>
+        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1120,7 +1112,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="EPSG:4326" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1134,8 +1126,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="$length * 100" comment="" typeName="double precision" precision="0" name="length_km" type="6" subType="0"/>
-        <field length="-1" expression="$length * 100 * 1000" comment="" typeName="double precision" precision="0" name="length_m" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1148,264 +1140,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="RouteLen" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="RouteLen" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" description="Only show when active in Atlas">
-            <rule symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM" description="This should be disabled, since it's only for legends"/>
-            <rule symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM" description="This should be disabled, since it's only for legends"/>
-            <rule symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM" description="This should be disabled, since it's only for legends"/>
-            <rule symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail" description="This should be disabled, since it's only for legends"/>
+          <rule label="Show by day" symbol="0" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule label="21KM" symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule label="10KM" symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule label="5KM" symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule label="Trail" symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show"/>
-          <rule symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day"/>
+          <rule label="Always show" symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule label="Always show by day" symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@0@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1413,308 +1405,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{d9268524-45f1-4731-945d-c43780c8de62}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1722,308 +1714,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.25"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@2@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2031,308 +2023,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@3@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@3@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2340,308 +2332,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@4@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@4@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@4@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2649,302 +2641,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="MapUnit"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@4@2" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@2" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@4@3" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@3" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="5" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="6" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="6" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.46" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.46"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2956,334 +2948,334 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" description="Active routes">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round($length / 1000, 0)" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="km_marker()" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="1" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="1" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" description="Route lengths">
+          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100, 4 )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="km_marker()" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="50" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapAtNoCost" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="50" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapAtNoCost" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3292,77 +3284,77 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{99bd229d-7319-436f-b616-1be11812c381}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3370,16 +3362,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3390,8 +3382,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3400,8 +3392,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3410,8 +3402,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3420,8 +3412,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3430,8 +3422,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3454,8 +3446,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3464,8 +3456,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3474,24 +3466,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="begin" index="1" name=""/>
-        <alias field="end" index="2" name=""/>
-        <alias field="Distance" index="3" name=""/>
-        <alias field="RouteLen" index="4" name=""/>
-        <alias field="Sort" index="5" name=""/>
-        <alias field="day" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="length_m" index="9" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -3518,49 +3510,49 @@
         <default expression="" field="length_m" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="$length * 100" comment="" typeName="double precision" precision="0" name="length_km" type="6" subType="0"/>
-        <field length="-1" expression="$length * 100 * 1000" comment="" typeName="double precision" precision="0" name="length_m" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="121" type="field" name="Name"/>
-          <column hidden="0" width="141" type="field" name="begin"/>
-          <column hidden="0" width="31" type="field" name="end"/>
-          <column hidden="0" width="66" type="field" name="Distance"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="39" type="field" name="RouteLen"/>
-          <column hidden="0" width="250" type="field" name="Source"/>
-          <column hidden="0" width="175" type="field" name="length_m"/>
-          <column hidden="0" width="50" type="field" name="Sort"/>
-          <column hidden="0" width="31" type="field" name="day"/>
-          <column hidden="0" width="266" type="field" name="length_km"/>
+          <column width="121" name="Name" hidden="0" type="field"/>
+          <column width="141" name="begin" hidden="0" type="field"/>
+          <column width="31" name="end" hidden="0" type="field"/>
+          <column width="66" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="39" name="RouteLen" hidden="0" type="field"/>
+          <column width="250" name="Source" hidden="0" type="field"/>
+          <column width="175" name="length_m" hidden="0" type="field"/>
+          <column width="50" name="Sort" hidden="0" type="field"/>
+          <column width="31" name="day" hidden="0" type="field"/>
+          <column width="266" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3606,39 +3598,39 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3712,189 +3704,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{53b6bbaf-4722-434f-a142-936b95477967}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="183,72,75,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <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="0.26"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3905,15 +3897,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3943,9 +3935,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias name="" index="0" field="ID"/>
+        <alias name="" index="1" field="height"/>
+        <alias name="" index="2" field="elevation"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="ID"/>
@@ -3958,20 +3950,20 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="elevation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="ID" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="height" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="elevation" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="ID" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="height" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="elevation" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3994,7 +3986,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Polygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4070,173 +4062,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <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="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4247,17 +4239,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -4294,10 +4286,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -4312,22 +4304,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4350,25 +4342,539 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Polygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+      <extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89967145949319871</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37673321782479974</xmin>
+        <ymin>-33.94582464707783487</ymin>
+        <xmax>18.42224231378492405</xmax>
+        <ymax>-33.89967145949319871</ymax>
+      </wgs84extent>
+      <id>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</id>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>fence_and_cone_groups</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
+        <links/>
+        <dates/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
+      </resourceMetadata>
+      <provider encoding="">virtual</provider>
+      <vectorjoins/>
+      <layerDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </layerDependencies>
+      <dataDependencies>
+        <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      </dataDependencies>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <metadataUrls/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+              <Option type="Map">
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+        <symbols>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="cross"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </symbols>
+        <rotation/>
+        <sizescale/>
+      </renderer-v2>
+      <customproperties>
+        <Option type="Map">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;name&quot;"/>
+          </Option>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+          <axisSymbol>
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+        <properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks/>
+        <checkConfiguration type="Map">
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
+          </Option>
+        </checkConfiguration>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field name="name" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="group" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="type" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="fence_len" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="cone_len" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
+        <alias name="" index="5" field="cone_len"/>
+      </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="name"/>
+        <policy policy="Duplicate" field="group"/>
+        <policy policy="Duplicate" field="type"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="fence_len"/>
+        <policy policy="Duplicate" field="cone_len"/>
+      </splitPolicies>
+      <defaults>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column width="306" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath></editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+    geom = feature.geometry()
+    control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field editable="1" name="cone_len"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
+      </editable>
+      <labelOnTop>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+      </labelOnTop>
+      <reuseLastValue>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+      </reuseLastValue>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>"name"</previewExpression>
+      <mapTip enabled="1"></mapTip>
+    </maplayer>
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42000208179202403</xmax>
-        <ymax>-33.89964429152626479</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42000208179202403</xmax>
-        <ymax>-33.89964429152626479</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </wgs84extent>
       <id>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>cone_only_groups</layername>
+      <layername>cone_groups</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -4426,173 +4932,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="38,162,105,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="f_diagonal" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="f_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4603,68 +5109,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="int" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="1" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="0" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4672,22 +5178,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="1" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -4731,11 +5237,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -4752,31 +5258,32 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="306" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="group"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="cone_len"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="306" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4815,25 +5322,25 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4899,7 +5406,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4924,189 +5431,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,85,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,85,255,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5117,151 +5624,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="Name" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="Name" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="LineGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="LineGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5269,16 +5776,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5301,8 +5808,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Name"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -5313,22 +5820,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="Name" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5364,8 +5871,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5373,7 +5880,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5439,7 +5946,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5464,319 +5971,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" description="Only show when active in Atlas"/>
-          <rule symbol="1" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" description="Only show when active in Atlas"/>
-          <rule symbol="2" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" description="Only show when active in Atlas"/>
+          <rule label="21KM" symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule label="10KM" symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule label="5KM" symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="miter" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="area" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="miter"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="210,32,39,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="area"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@0@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@0@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5784,147 +6291,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <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="MapUnit"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5932,100 +6439,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{43e5e783-9402-4471-b264-9b43c9035744}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6033,147 +6540,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@2@0@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="69,100,25,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6181,100 +6688,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@2@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6282,41 +6789,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="69,100,25,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <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="MapUnit"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="69,100,25,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="MapUnit"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6328,66 +6835,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6395,16 +6902,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6422,16 +6929,16 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="Distance"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -6442,22 +6949,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="Distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="Distance"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="id"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6502,17 +7009,17 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6520,7 +7027,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6594,187 +7101,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.796078" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="0.796078" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="227,0,185,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="227,0,185,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,0"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6785,268 +7292,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="8" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="1" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="8" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="1" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="4" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="227,0,185,255">
+              <text-style fontSize="4" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="227,0,185,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="2" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -7055,200 +7562,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7256,16 +7763,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="10" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="10" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7276,8 +7783,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7286,8 +7793,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7296,17 +7803,17 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -7319,25 +7826,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="position"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7413,25 +7920,25 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer wkbType="Polygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
       <extent>
-        <xmin>18.37673321782479974</xmin>
-        <ymin>-33.94582464707783487</ymin>
+        <xmin>18.37682610786999859</xmin>
+        <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.90152236072362513</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37673321782479974</xmin>
-        <ymin>-33.94582464707783487</ymin>
+        <xmin>18.37682610786999859</xmin>
+        <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.90152236072362513</ymax>
       </wgs84extent>
       <id>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</id>
-      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
+      <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>fence_and_cone_groups</layername>
+      <layername>fence_groups</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -7479,7 +7986,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7508,173 +8015,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,85,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,85,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,85,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,85,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7685,68 +8192,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7754,22 +8261,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="1" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -7804,13 +8311,6 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
         <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
@@ -7820,19 +8320,17 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
         <policy policy="Duplicate" field="group"/>
         <policy policy="Duplicate" field="type"/>
         <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="cone_len"/>
         <policy policy="Duplicate" field="fence_len"/>
       </splitPolicies>
       <defaults>
@@ -7840,38 +8338,35 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="group" applyOnUpdate="0"/>
         <default expression="" field="type" applyOnUpdate="0"/>
         <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
         <default expression="" field="fence_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="415" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="group"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="cone_len"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="fence_len"/>
+          <column width="415" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7911,38 +8406,38 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89963911218388404</ymax>
+        <ymax>-33.89967145949319871</ymax>
       </wgs84extent>
       <id>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</id>
       <datasource>./fencing.shp|layername=fencing</datasource>
@@ -7997,7 +8492,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8011,26 +8506,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="cone_len" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis maxScale="0" hasScaleBasedVisibilityFlag="0" minScale="1e+08" version="3.8.3-Zanzibar" simplifyMaxScale="1" styleCategories="AllStyleCategories" labelsEnabled="1" simplifyAlgorithm="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyDrawingTol="1" readOnly="0">
+          <qgis simplifyDrawingHints="1" simplifyLocal="1" minScale="1e+08" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" readOnly="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" version="3.8.3-Zanzibar" maxScale="0" simplifyAlgorithm="0" simplifyDrawingTol="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
+            <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
+                <rule label="Visible" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol clip_to_extent="1" force_rhr="0" alpha="1" name="0" type="line">
-                  <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <symbol alpha="1" clip_to_extent="1" name="0" force_rhr="0" type="line">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleLine">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8049,9 +8544,9 @@ def my_form_open(dialog, layer, feature):
                     <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8060,64 +8555,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style textOpacity="0.8" fontSize="11" fieldName="comment" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" isExpression="0" fontUnderline="0" namedStyle="Regular" fontWordSpacing="0" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" blendMode="0" textColor="0,0,0,255" fontCapitals="0">
-                      <text-buffer bufferBlendMode="0" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255"/>
-                      <background shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeOpacity="0.6" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1"/>
-                      <shadow shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style fontSize="11" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.8" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Regular" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="comment">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                      <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.6" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" wrapChar="" rightDirectionSymbol=">" autoWrapLength="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0"/>
-                    <placement rotationAngle="0" maxCurvedCharAngleOut="-25" centroidWhole="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" offsetUnits="MM" priority="5" preserveRotation="1" xOffset="0" yOffset="0" geometryGenerator="" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" placement="4" placementFlags="2" offsetType="0" dist="5" fitInPolygonOnly="0" quadOffset="4"/>
-                    <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" displayAll="1" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="1" labelPerPart="0"/>
+                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" placementFlags="2" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="5" yOffset="0" rotationAngle="0" distUnits="MM"/>
+                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" displayAll="1" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style textOpacity="1" fontSize="12" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" fontWordSpacing="0" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" blendMode="0" textColor="0,0,0,255" fontCapitals="0">
-                      <text-buffer bufferBlendMode="0" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255"/>
-                      <background shapeRotation="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0"/>
-                      <shadow shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style fontSize="12" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Semibold" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                      <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" wrapChar="" rightDirectionSymbol=">" autoWrapLength="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0"/>
-                    <placement rotationAngle="0" maxCurvedCharAngleOut="-25" centroidWhole="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorType="PointGeometry" offsetUnits="MM" priority="5" preserveRotation="1" xOffset="0" yOffset="0" geometryGenerator="" geometryGeneratorEnabled="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" placement="2" placementFlags="15" offsetType="0" dist="1" fitInPolygonOnly="0" quadOffset="4"/>
-                    <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" displayAll="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" placementFlags="15" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="1" yOffset="0" rotationAngle="0" distUnits="MM"/>
+                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" displayAll="0" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8133,18 +8628,18 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory labelPlacementMethod="XHeight" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" rotationOffset="270" penAlpha="255" backgroundAlpha="255" minimumSize="0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory opacity="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penWidth="0" penAlpha="255" width="15" rotationOffset="270" minScaleDenominator="0" barWidth="5" backgroundAlpha="255" minimumSize="0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute label="" color="#000000" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings dist="0" zIndex="0" priority="0" obstacle="0" placement="2" linePlacementFlags="18" showAll="1">
+            <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -8232,17 +8727,17 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias name="" index="0" field="id"/>
+              <alias name="" index="1" field="group"/>
+              <alias name="" index="2" field="comment"/>
+              <alias name="" index="3" field="moveable"/>
+              <alias name="" index="4" field="type"/>
+              <alias name="" index="5" field="name"/>
+              <alias name="" index="6" field="hidden"/>
+              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
+              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
+              <alias name="" index="9" field="fence_len"/>
+              <alias name="" index="10" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -8260,53 +8755,53 @@ def my_form_open(dialog, layer, feature):
               <default expression="" field="cone_len" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="comment" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="id"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="group"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="comment"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="moveable"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="type"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="name"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="hidden"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positiony"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positionx"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="fence_len"/>
+              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="cone_len"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint desc="" field="id" exp=""/>
+              <constraint desc="" field="group" exp=""/>
+              <constraint desc="" field="comment" exp=""/>
+              <constraint desc="" field="moveable" exp=""/>
+              <constraint desc="" field="type" exp=""/>
+              <constraint desc="" field="name" exp=""/>
+              <constraint desc="" field="hidden" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+              <constraint desc="" field="fence_len" exp=""/>
+              <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="cone_len" type="6" subType="0"/>
+              <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column hidden="0" width="-1" name="id" type="field"/>
-                <column hidden="0" width="-1" name="group" type="field"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column hidden="0" width="223" name="comment" type="field"/>
-                <column hidden="0" width="-1" name="moveable" type="field"/>
-                <column hidden="0" width="-1" name="type" type="field"/>
-                <column hidden="0" width="414" name="name" type="field"/>
-                <column hidden="0" width="-1" name="hidden" type="field"/>
-                <column hidden="0" width="-1" name="fence_len" type="field"/>
-                <column hidden="0" width="-1" name="cone_len" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positiony" type="field"/>
-                <column hidden="1" width="-1" name="auxiliary_storage_labeling_positionx" type="field"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8351,18 +8846,18 @@ def my_form_open(dialog, layer, feature):
               <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8379,458 +8874,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <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="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones"/>
-            <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences"/>
-            <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences"/>
-            <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction"/>
+          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible"/>
-          <rule symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule label="Is Visible" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+          <rule label="Always show" symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="1;4" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="Point" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dot" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="1;4"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="Point"/>
+                <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="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dot"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="4;3" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="4;3"/>
+                <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="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="5" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8838,530 +9333,670 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
+        <rules key="{77c2da81-3827-4244-9739-7740942dd20c}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{63187879-e575-420a-b139-9295c560dc57}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.80000000000000004" fontSize="11" multilineHeightUnit="Percentage" fieldName="comment" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="comment" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOpacity="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeJoinStyle="128" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.6" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="255,255,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.6"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="5" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8200000000000001" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="1" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="5" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8200000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" description="Fence lengths">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{1125f4a3-b660-4c4e-bb30-9a3f89c0fc6e}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="11" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="6" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" description="Cones lengths">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{8c77ba5e-b512-4ff7-b7ad-7fb26939c5cd}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="11" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="6" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{db4fb198-5646-4029-8e3c-b5f68e241df8}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="11" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="6" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="14" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule active="0" filter="&quot;hidden&quot; IS NULL" description="Always show" key="{a7eac08d-b9bd-4780-93fa-cd225df55dde}">
+            <settings calloutType="simple">
+              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <families/>
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <Option type="Map">
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -9370,68 +10005,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;id&quot;" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9439,16 +10074,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9527,16 +10162,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="comment"/>
+        <alias name="" index="3" field="moveable"/>
+        <alias name="" index="4" field="type"/>
+        <alias name="" index="5" field="name"/>
+        <alias name="" index="6" field="hidden"/>
+        <alias name="" index="7" field="day"/>
+        <alias name="" index="8" field="fence_len"/>
+        <alias name="" index="9" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -9563,50 +10198,50 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="comment" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="comment" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="moveable" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="hidden" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="fence_len" type="6" subType="0"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" typeName="double precision" precision="0" name="cone_len" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
+        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;name&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="group"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="373" type="field" name="comment"/>
-          <column hidden="0" width="-1" type="field" name="moveable"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="316" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="hidden"/>
-          <column hidden="0" width="-1" type="field" name="fence_len"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="cone_len"/>
+          <column width="31" name="id" hidden="0" type="field"/>
+          <column width="52" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="143" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="303" name="name" hidden="0" type="field"/>
+          <column width="54" name="hidden" hidden="0" type="field"/>
+          <column width="74" name="fence_len" hidden="0" type="field"/>
+          <column width="40" name="day" hidden="0" type="field"/>
+          <column width="65" name="cone_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9653,38 +10288,38 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="comment"/>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="hidden"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="moveable"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="comment" reuseLastValue="0"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="hidden" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="moveable" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -9758,189 +10393,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,178,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,178,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9951,66 +10586,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10018,16 +10653,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10043,7 +10678,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -10052,19 +10687,19 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="id" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10099,7 +10734,7 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10107,7 +10742,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10181,173 +10816,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="26,0,201,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="dot" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="26,0,201,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="dot"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10358,77 +10993,77 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10436,22 +11071,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option value="true" type="bool" name="active"/>
-                <Option value="id" type="QString" name="field"/>
-                <Option value="2" type="int" name="type"/>
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10462,8 +11097,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10472,8 +11107,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10482,8 +11117,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -10497,10 +11132,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="page"/>
+        <alias name="" index="3" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -10515,28 +11150,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="page"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10573,9 +11208,9 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10583,7 +11218,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -10649,7 +11284,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10660,7 +11295,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" dynamicForm="0" upsertOnEdit="1" editable="1" cascadedDelete="0" targetFieldName="position" hasCustomPrefix="1" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position">
+        <join customPrefix="csv_" joinFieldName="position" memoryCache="0" editable="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -10687,264 +11322,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="id" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="id" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="114,155,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="114,155,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan" description="Show in marshal overview"/>
-          <rule symbol="1" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan"/>
-          <rule symbol="2" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps"/>
+          <rule label="Show by day in marshal plan" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule label="Always show in marshal plan" symbol="1" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule label="Show in marshal maps" symbol="2" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.8" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.8" type="marker" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="0.01" type="marker" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="0.01" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
+            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10953,824 +11588,824 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="2" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="1" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="2" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
+          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.5" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.5" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="AlwaysShow" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="FontOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontStyle">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ShapeOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ShapeOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="8" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="5" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.59999999999999998" fontSize="6" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.59999999999999998" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="8" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="5" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="8" multilineHeightUnit="Percentage" fieldName="position" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="3" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.20000000000000001">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="133,182,111,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="133,182,111,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="10" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="0" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -11779,204 +12414,205 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{444d8fb8-2321-4272-9699-88b713425993}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11984,16 +12620,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12004,8 +12640,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12014,8 +12650,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12024,8 +12660,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12034,8 +12670,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12049,11 +12685,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -12070,31 +12706,31 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="notes" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="notes" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="position"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="notes"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12173,85 +12809,85 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="csv_10_distance"/>
-        <field labelOnTop="0" name="csv_21_distance"/>
-        <field labelOnTop="0" name="csv_Description"/>
-        <field labelOnTop="0" name="csv_capt_1"/>
-        <field labelOnTop="0" name="csv_captai"/>
-        <field labelOnTop="0" name="csv_captain"/>
-        <field labelOnTop="0" name="csv_captain_email"/>
-        <field labelOnTop="0" name="csv_captain_number"/>
-        <field labelOnTop="0" name="csv_captain_phone"/>
-        <field labelOnTop="0" name="csv_club"/>
-        <field labelOnTop="0" name="csv_day"/>
-        <field labelOnTop="0" name="csv_days"/>
-        <field labelOnTop="0" name="csv_email"/>
-        <field labelOnTop="0" name="csv_first runner"/>
-        <field labelOnTop="0" name="csv_first_"/>
-        <field labelOnTop="0" name="csv_first_runner"/>
-        <field labelOnTop="0" name="csv_firstname"/>
-        <field labelOnTop="0" name="csv_instru"/>
-        <field labelOnTop="0" name="csv_instructions"/>
-        <field labelOnTop="0" name="csv_last runner"/>
-        <field labelOnTop="0" name="csv_last_r"/>
-        <field labelOnTop="0" name="csv_last_runner"/>
-        <field labelOnTop="0" name="csv_name"/>
-        <field labelOnTop="0" name="csv_phone"/>
-        <field labelOnTop="0" name="csv_positi"/>
-        <field labelOnTop="0" name="csv_position"/>
-        <field labelOnTop="0" name="csv_race"/>
-        <field labelOnTop="0" name="csv_races"/>
-        <field labelOnTop="0" name="csv_surname"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="marshals_by_position_captain"/>
-        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
-        <field labelOnTop="0" name="marshals_by_position_club"/>
-        <field labelOnTop="0" name="marshals_by_position_day"/>
-        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_instructions"/>
-        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
-        <field labelOnTop="0" name="marshals_by_position_position"/>
-        <field labelOnTop="0" name="marshals_by_position_race"/>
-        <field labelOnTop="0" name="notes"/>
-        <field labelOnTop="0" name="oldpositio"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="xyposition"/>
+        <field name="csv_10_distance" labelOnTop="0"/>
+        <field name="csv_21_distance" labelOnTop="0"/>
+        <field name="csv_Description" labelOnTop="0"/>
+        <field name="csv_capt_1" labelOnTop="0"/>
+        <field name="csv_captai" labelOnTop="0"/>
+        <field name="csv_captain" labelOnTop="0"/>
+        <field name="csv_captain_email" labelOnTop="0"/>
+        <field name="csv_captain_number" labelOnTop="0"/>
+        <field name="csv_captain_phone" labelOnTop="0"/>
+        <field name="csv_club" labelOnTop="0"/>
+        <field name="csv_day" labelOnTop="0"/>
+        <field name="csv_days" labelOnTop="0"/>
+        <field name="csv_email" labelOnTop="0"/>
+        <field name="csv_first runner" labelOnTop="0"/>
+        <field name="csv_first_" labelOnTop="0"/>
+        <field name="csv_first_runner" labelOnTop="0"/>
+        <field name="csv_firstname" labelOnTop="0"/>
+        <field name="csv_instru" labelOnTop="0"/>
+        <field name="csv_instructions" labelOnTop="0"/>
+        <field name="csv_last runner" labelOnTop="0"/>
+        <field name="csv_last_r" labelOnTop="0"/>
+        <field name="csv_last_runner" labelOnTop="0"/>
+        <field name="csv_name" labelOnTop="0"/>
+        <field name="csv_phone" labelOnTop="0"/>
+        <field name="csv_positi" labelOnTop="0"/>
+        <field name="csv_position" labelOnTop="0"/>
+        <field name="csv_race" labelOnTop="0"/>
+        <field name="csv_races" labelOnTop="0"/>
+        <field name="csv_surname" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="marshals_by_position_captain" labelOnTop="0"/>
+        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
+        <field name="marshals_by_position_club" labelOnTop="0"/>
+        <field name="marshals_by_position_day" labelOnTop="0"/>
+        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_instructions" labelOnTop="0"/>
+        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
+        <field name="marshals_by_position_position" labelOnTop="0"/>
+        <field name="marshals_by_position_race" labelOnTop="0"/>
+        <field name="notes" labelOnTop="0"/>
+        <field name="oldpositio" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="csv_captain"/>
-        <field reuseLastValue="0" name="csv_captain_email"/>
-        <field reuseLastValue="0" name="csv_captain_phone"/>
-        <field reuseLastValue="0" name="csv_club"/>
-        <field reuseLastValue="0" name="csv_day"/>
-        <field reuseLastValue="0" name="csv_days"/>
-        <field reuseLastValue="0" name="csv_email"/>
-        <field reuseLastValue="0" name="csv_first_runner"/>
-        <field reuseLastValue="0" name="csv_firstname"/>
-        <field reuseLastValue="0" name="csv_instructions"/>
-        <field reuseLastValue="0" name="csv_last_runner"/>
-        <field reuseLastValue="0" name="csv_name"/>
-        <field reuseLastValue="0" name="csv_phone"/>
-        <field reuseLastValue="0" name="csv_position"/>
-        <field reuseLastValue="0" name="csv_race"/>
-        <field reuseLastValue="0" name="csv_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
-        <field reuseLastValue="0" name="marshals_by_position_club"/>
-        <field reuseLastValue="0" name="marshals_by_position_day"/>
-        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
-        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_position"/>
-        <field reuseLastValue="0" name="marshals_by_position_race"/>
-        <field reuseLastValue="0" name="notes"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="type"/>
-        <field reuseLastValue="0" name="xyposition"/>
+        <field name="csv_captain" reuseLastValue="0"/>
+        <field name="csv_captain_email" reuseLastValue="0"/>
+        <field name="csv_captain_phone" reuseLastValue="0"/>
+        <field name="csv_club" reuseLastValue="0"/>
+        <field name="csv_day" reuseLastValue="0"/>
+        <field name="csv_days" reuseLastValue="0"/>
+        <field name="csv_email" reuseLastValue="0"/>
+        <field name="csv_first_runner" reuseLastValue="0"/>
+        <field name="csv_firstname" reuseLastValue="0"/>
+        <field name="csv_instructions" reuseLastValue="0"/>
+        <field name="csv_last_runner" reuseLastValue="0"/>
+        <field name="csv_name" reuseLastValue="0"/>
+        <field name="csv_phone" reuseLastValue="0"/>
+        <field name="csv_position" reuseLastValue="0"/>
+        <field name="csv_race" reuseLastValue="0"/>
+        <field name="csv_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
+        <field name="marshals_by_position_club" reuseLastValue="0"/>
+        <field name="marshals_by_position_day" reuseLastValue="0"/>
+        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
+        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_position" reuseLastValue="0"/>
+        <field name="marshals_by_position_race" reuseLastValue="0"/>
+        <field name="notes" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+        <field name="xyposition" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -12301,7 +12937,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer maxScale="100000" geometry="No geometry" wkbType="NoGeometry" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshEnabled="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" type="vector" readOnly="0" autoRefreshTime="0">
+    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" readOnly="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" maxScale="100000" type="vector" geometry="No geometry" wkbType="NoGeometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12355,7 +12991,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" miny="0" dimensions="2" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start/>
@@ -12380,138 +13016,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" accumulate="0" limitMode="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start/>
           <end/>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" showMarkerSymbolInSurfacePlots="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" name="" is_animated="0" type="line">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="243,166,178,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.6" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="243,166,178,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.6" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" name="" is_animated="0" type="fill">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="solid" name="style" type="QString"/>
+                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="style" value="solid" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" name="" is_animated="0" type="marker">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="243,166,178,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="diamond" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="174,119,127,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="3" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="243,166,178,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="diamond" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="174,119,127,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="3" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12520,13 +13156,13 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="first_name" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -12549,8 +13185,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12573,8 +13209,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12597,8 +13233,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
@@ -12640,19 +13276,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="first_name" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="club" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="race" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias name="" index="0" field="day"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="first_name"/>
+        <alias name="" index="3" field="surname"/>
+        <alias name="" index="4" field="club"/>
+        <alias name="" index="5" field="phone"/>
+        <alias name="" index="6" field="email"/>
+        <alias name="" index="7" field="captain"/>
+        <alias name="" index="8" field="captain_phone"/>
+        <alias name="" index="9" field="race"/>
+        <alias name="" index="10" field="first_runner"/>
+        <alias name="" index="11" field="last_runner"/>
+        <alias name="" index="12" field="instructions"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="day"/>
@@ -12685,55 +13321,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="surname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="club" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="email" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain_phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="race" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="last_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="instructions" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="day"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="position"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_name"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="surname"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="club"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="phone"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="email"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain_phone"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="race"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_runner"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="last_runner"/>
+        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="instructions"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="first_name" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="race" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="first_name" exp=""/>
+        <constraint desc="" field="surname" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="phone" exp=""/>
+        <constraint desc="" field="email" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="race" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" name="position" type="field"/>
-          <column hidden="0" width="-1" name="club" type="field"/>
-          <column hidden="0" width="-1" name="phone" type="field"/>
-          <column hidden="0" width="-1" name="email" type="field"/>
-          <column hidden="0" width="-1" name="captain" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" name="first_runner" type="field"/>
-          <column hidden="0" width="-1" name="last_runner" type="field"/>
-          <column hidden="0" width="-1" name="instructions" type="field"/>
-          <column hidden="0" width="-1" name="surname" type="field"/>
-          <column hidden="0" width="-1" name="day" type="field"/>
-          <column hidden="0" width="-1" name="first_name" type="field"/>
-          <column hidden="0" width="-1" name="race" type="field"/>
-          <column hidden="0" width="-1" name="captain_phone" type="field"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="first_name" hidden="0" type="field"/>
+          <column width="-1" name="race" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12789,52 +13425,52 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="10_distance"/>
-        <field labelOnTop="0" name="21_distance"/>
-        <field labelOnTop="0" name="5_distance"/>
-        <field labelOnTop="0" name="captain"/>
-        <field labelOnTop="0" name="captain_email"/>
-        <field labelOnTop="0" name="captain_number"/>
-        <field labelOnTop="0" name="captain_phone"/>
-        <field labelOnTop="0" name="club"/>
-        <field labelOnTop="0" name="days"/>
-        <field labelOnTop="0" name="email"/>
-        <field labelOnTop="0" name="first_name"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="firstname"/>
-        <field labelOnTop="0" name="instructions"/>
-        <field labelOnTop="0" name="last_name"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="phone"/>
-        <field labelOnTop="0" name="position"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="surname"/>
-        <field labelOnTop="0" name="tshirt"/>
+        <field name="10_distance" labelOnTop="0"/>
+        <field name="21_distance" labelOnTop="0"/>
+        <field name="5_distance" labelOnTop="0"/>
+        <field name="captain" labelOnTop="0"/>
+        <field name="captain_email" labelOnTop="0"/>
+        <field name="captain_number" labelOnTop="0"/>
+        <field name="captain_phone" labelOnTop="0"/>
+        <field name="club" labelOnTop="0"/>
+        <field name="days" labelOnTop="0"/>
+        <field name="email" labelOnTop="0"/>
+        <field name="first_name" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="firstname" labelOnTop="0"/>
+        <field name="instructions" labelOnTop="0"/>
+        <field name="last_name" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="phone" labelOnTop="0"/>
+        <field name="position" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="surname" labelOnTop="0"/>
+        <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="captain"/>
-        <field reuseLastValue="0" name="captain_email"/>
-        <field reuseLastValue="0" name="captain_phone"/>
-        <field reuseLastValue="0" name="club"/>
-        <field reuseLastValue="0" name="days"/>
-        <field reuseLastValue="0" name="email"/>
-        <field reuseLastValue="0" name="first_runner"/>
-        <field reuseLastValue="0" name="firstname"/>
-        <field reuseLastValue="0" name="instructions"/>
-        <field reuseLastValue="0" name="last_runner"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="phone"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="surname"/>
+        <field name="captain" reuseLastValue="0"/>
+        <field name="captain_email" reuseLastValue="0"/>
+        <field name="captain_phone" reuseLastValue="0"/>
+        <field name="club" reuseLastValue="0"/>
+        <field name="days" reuseLastValue="0"/>
+        <field name="email" reuseLastValue="0"/>
+        <field name="first_runner" reuseLastValue="0"/>
+        <field name="firstname" reuseLastValue="0"/>
+        <field name="instructions" reuseLastValue="0"/>
+        <field name="last_runner" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="phone" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="surname" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"/>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -12900,7 +13536,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12925,326 +13561,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="141,90,153,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="141,90,153,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{743d2826-031c-45d5-809e-09f032abdd16}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13257,66 +13893,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13324,16 +13960,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13356,8 +13992,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -13368,22 +14004,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13419,8 +14055,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13428,7 +14064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -13494,7 +14130,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13519,334 +14155,334 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="232,113,141,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="232,113,141,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="0.75" fontSize="8.5" multilineHeightUnit="Percentage" fieldName="name" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="8.5" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.75" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1.5" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1.5" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelRotation" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="PositionX">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_x" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                  <Option name="PositionX" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_x"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="PositionY">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_y" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                  <Option name="PositionY" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_y"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="1" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="2" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="0.20000000000000001" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="2" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.20000000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13854,16 +14490,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13874,8 +14510,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13884,8 +14520,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13894,8 +14530,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13904,8 +14540,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13914,8 +14550,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13924,8 +14560,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13934,8 +14570,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13944,8 +14580,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13954,23 +14590,23 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="osm_id"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="type"/>
+        <alias name="" index="4" field="z_order"/>
+        <alias name="" index="5" field="population"/>
+        <alias name="" index="6" field="label_x"/>
+        <alias name="" index="7" field="label_y"/>
+        <alias name="" index="8" field="label_rota"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -13995,43 +14631,43 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="label_rota" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="population" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="population" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="osm_id"/>
-          <column hidden="0" width="-1" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="0" width="-1" type="field" name="z_order"/>
-          <column hidden="0" width="-1" type="field" name="population"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="label_x"/>
-          <column hidden="0" width="-1" type="field" name="label_y"/>
-          <column hidden="0" width="-1" type="field" name="label_rota"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14074,15 +14710,15 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="population"/>
-        <field labelOnTop="0" name="type"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="population" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14090,7 +14726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14156,7 +14792,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14181,374 +14817,374 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,158,23,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,158,23,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="0.80000000000000004" fontSize="7" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="7" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="196,60,57,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="196,60,57,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="0" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MapUnit" placement="3" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="LineGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="3" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="4" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="0.29999999999999999" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="5" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="1" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" priority="3" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="3" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="4" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="5" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.29999999999999999" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="always_sho" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="&quot;&quot;" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="Priority" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="Show" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14556,16 +15192,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14576,8 +15212,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14586,8 +15222,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14631,8 +15267,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14695,22 +15331,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias name="" index="0" field="osm_id"/>
+        <alias name="" index="1" field="name"/>
+        <alias name="" index="2" field="highway"/>
+        <alias name="" index="3" field="waterway"/>
+        <alias name="" index="4" field="aerialway"/>
+        <alias name="" index="5" field="barrier"/>
+        <alias name="" index="6" field="man_made"/>
+        <alias name="" index="7" field="z_order"/>
+        <alias name="" index="8" field="other_tags"/>
+        <alias name="" index="9" field="never_show"/>
+        <alias name="" index="10" field="label_x"/>
+        <alias name="" index="11" field="label_y"/>
+        <alias name="" index="12" field="label_rota"/>
+        <alias name="" index="13" field="always_sho"/>
+        <alias name="" index="14" field="resident_a"/>
+        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="osm_id"/>
@@ -14749,64 +15385,64 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="highway" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="waterway" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="aerialway" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="barrier" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="man_made" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="other_tags" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="never_show" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="always_sho" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="resident_a" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="highway" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="waterway" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aerialway" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="never_show" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="always_sho" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="resident_a" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_show" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="osm_id"/>
-          <column hidden="0" width="160" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="z_order"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="highway"/>
-          <column hidden="0" width="-1" type="field" name="waterway"/>
-          <column hidden="0" width="-1" type="field" name="aerialway"/>
-          <column hidden="0" width="-1" type="field" name="barrier"/>
-          <column hidden="0" width="-1" type="field" name="man_made"/>
-          <column hidden="0" width="175" type="field" name="other_tags"/>
-          <column hidden="0" width="-1" type="field" name="never_show"/>
-          <column hidden="0" width="-1" type="field" name="label_x"/>
-          <column hidden="0" width="-1" type="field" name="label_y"/>
-          <column hidden="0" width="-1" type="field" name="label_rota"/>
-          <column hidden="0" width="-1" type="field" name="always_sho"/>
-          <column hidden="0" width="-1" type="field" name="resident_a"/>
-          <column hidden="0" width="-1" type="field" name="auxiliary_storage_labeling_show"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="160" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="175" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14874,58 +15510,58 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="aerialway"/>
-        <field labelOnTop="0" name="always_sho"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
-        <field labelOnTop="0" name="barrier"/>
-        <field labelOnTop="0" name="highway"/>
-        <field labelOnTop="0" name="label_rota"/>
-        <field labelOnTop="0" name="label_x"/>
-        <field labelOnTop="0" name="label_y"/>
-        <field labelOnTop="0" name="man_made"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="never_show"/>
-        <field labelOnTop="0" name="orig_access"/>
-        <field labelOnTop="0" name="orig_always_sho"/>
-        <field labelOnTop="0" name="orig_bridge"/>
-        <field labelOnTop="0" name="orig_c_z_order"/>
-        <field labelOnTop="0" name="orig_class"/>
-        <field labelOnTop="0" name="orig_id"/>
-        <field labelOnTop="0" name="orig_label_rota"/>
-        <field labelOnTop="0" name="orig_label_x"/>
-        <field labelOnTop="0" name="orig_label_y"/>
-        <field labelOnTop="0" name="orig_name"/>
-        <field labelOnTop="0" name="orig_oneway"/>
-        <field labelOnTop="0" name="orig_ref"/>
-        <field labelOnTop="0" name="orig_service"/>
-        <field labelOnTop="0" name="orig_show"/>
-        <field labelOnTop="0" name="orig_tunnel"/>
-        <field labelOnTop="0" name="orig_type"/>
-        <field labelOnTop="0" name="orig_z_order"/>
-        <field labelOnTop="0" name="osm_id"/>
-        <field labelOnTop="0" name="other_tags"/>
-        <field labelOnTop="0" name="resident_a"/>
-        <field labelOnTop="0" name="resident_access"/>
-        <field labelOnTop="0" name="waterway"/>
-        <field labelOnTop="0" name="z_order"/>
+        <field name="aerialway" labelOnTop="0"/>
+        <field name="always_sho" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
+        <field name="barrier" labelOnTop="0"/>
+        <field name="highway" labelOnTop="0"/>
+        <field name="label_rota" labelOnTop="0"/>
+        <field name="label_x" labelOnTop="0"/>
+        <field name="label_y" labelOnTop="0"/>
+        <field name="man_made" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="never_show" labelOnTop="0"/>
+        <field name="orig_access" labelOnTop="0"/>
+        <field name="orig_always_sho" labelOnTop="0"/>
+        <field name="orig_bridge" labelOnTop="0"/>
+        <field name="orig_c_z_order" labelOnTop="0"/>
+        <field name="orig_class" labelOnTop="0"/>
+        <field name="orig_id" labelOnTop="0"/>
+        <field name="orig_label_rota" labelOnTop="0"/>
+        <field name="orig_label_x" labelOnTop="0"/>
+        <field name="orig_label_y" labelOnTop="0"/>
+        <field name="orig_name" labelOnTop="0"/>
+        <field name="orig_oneway" labelOnTop="0"/>
+        <field name="orig_ref" labelOnTop="0"/>
+        <field name="orig_service" labelOnTop="0"/>
+        <field name="orig_show" labelOnTop="0"/>
+        <field name="orig_tunnel" labelOnTop="0"/>
+        <field name="orig_type" labelOnTop="0"/>
+        <field name="orig_z_order" labelOnTop="0"/>
+        <field name="osm_id" labelOnTop="0"/>
+        <field name="other_tags" labelOnTop="0"/>
+        <field name="resident_a" labelOnTop="0"/>
+        <field name="resident_access" labelOnTop="0"/>
+        <field name="waterway" labelOnTop="0"/>
+        <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="aerialway"/>
-        <field reuseLastValue="0" name="always_sho"/>
-        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
-        <field reuseLastValue="0" name="barrier"/>
-        <field reuseLastValue="0" name="highway"/>
-        <field reuseLastValue="0" name="label_rota"/>
-        <field reuseLastValue="0" name="label_x"/>
-        <field reuseLastValue="0" name="label_y"/>
-        <field reuseLastValue="0" name="man_made"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="never_show"/>
-        <field reuseLastValue="0" name="osm_id"/>
-        <field reuseLastValue="0" name="other_tags"/>
-        <field reuseLastValue="0" name="resident_a"/>
-        <field reuseLastValue="0" name="waterway"/>
-        <field reuseLastValue="0" name="z_order"/>
+        <field name="aerialway" reuseLastValue="0"/>
+        <field name="always_sho" reuseLastValue="0"/>
+        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
+        <field name="barrier" reuseLastValue="0"/>
+        <field name="highway" reuseLastValue="0"/>
+        <field name="label_rota" reuseLastValue="0"/>
+        <field name="label_x" reuseLastValue="0"/>
+        <field name="label_y" reuseLastValue="0"/>
+        <field name="man_made" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="never_show" reuseLastValue="0"/>
+        <field name="osm_id" reuseLastValue="0"/>
+        <field name="other_tags" reuseLastValue="0"/>
+        <field name="resident_a" reuseLastValue="0"/>
+        <field name="waterway" reuseLastValue="0"/>
+        <field name="z_order" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -14975,7 +15611,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15041,7 +15677,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15066,145 +15702,145 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="231,113,72,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="231,113,72,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
           <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
@@ -15214,363 +15850,363 @@ def my_form_open(dialog, layer, feature):
           <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="star" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.5" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="name" type="QString" value="star"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.5"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,32,80,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,32,80,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/road_closure.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/road_closure.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,12,254,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="255,255,255,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,12,254,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="255,255,255,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <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>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <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="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" 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="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <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>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <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>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <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>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <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="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <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="spec" type="QString" value="rgb"/>
+                    <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>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="5" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
+            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="43,153,41,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="43,153,41,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15579,183 +16215,183 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="0.90000000000000002" fontSize="10" multilineHeightUnit="Percentage" fieldName="name" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="2" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOpacity="0.69999999999999996" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="2" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="2" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeRadiiY="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelDistance">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelDistance" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="OffsetQuad">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="2" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                  <Option name="OffsetQuad" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="2"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="1" centroidWhole="0" dist="3" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="2" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="3" xOffset="2" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1.8" obstacleType="0" zIndex="10" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="2" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="3" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="3" xOffset="2" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="2" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15763,16 +16399,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15809,10 +16445,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="name"/>
+        <alias name="" index="3" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -15827,28 +16463,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="name"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15886,10 +16522,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -15897,7 +16533,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -15971,246 +16607,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" pass="0" enabled="1" locked="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
+            <layer locked="0" pass="0" enabled="1" class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
               <Option type="Map">
-                <Option value="135" type="QString" name="angle"/>
-                <Option value="during_render" type="QString" name="clip_mode"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="feature" type="QString" name="coordinate_reference"/>
-                <Option value="2" type="QString" name="distance"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
-                <Option value="MM" type="QString" name="distance_unit"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option name="angle" type="QString" value="135"/>
+                <Option name="clip_mode" type="QString" value="during_render"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="coordinate_reference" type="QString" value="feature"/>
+                <Option name="distance" type="QString" value="2"/>
+                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="distance_unit" type="QString" value="MM"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <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="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="@0@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="line">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="align_dash_pattern"/>
-                    <Option value="square" type="QString" name="capstyle"/>
-                    <Option value="5;2" type="QString" name="customdash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="customdash_unit"/>
-                    <Option value="0" type="QString" name="dash_pattern_offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                    <Option value="0" type="QString" name="draw_inside_polygon"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="211,134,33,255" type="QString" name="line_color"/>
-                    <Option value="solid" type="QString" name="line_style"/>
-                    <Option value="0.3" type="QString" name="line_width"/>
-                    <Option value="MM" type="QString" name="line_width_unit"/>
-                    <Option value="0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0" type="QString" name="ring_filter"/>
-                    <Option value="0" type="QString" name="trim_distance_end"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                    <Option value="0" type="QString" name="trim_distance_start"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                    <Option value="0" type="QString" name="use_custom_dash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                    <Option name="align_dash_pattern" type="QString" value="0"/>
+                    <Option name="capstyle" type="QString" value="square"/>
+                    <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="bevel"/>
+                    <Option name="line_color" type="QString" value="211,134,33,255"/>
+                    <Option name="line_style" type="QString" value="solid"/>
+                    <Option name="line_width" type="QString" value="0.3"/>
+                    <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.46" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="no" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.46"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="no"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16221,66 +16857,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16288,16 +16924,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="1" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16313,7 +16949,7 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="FID"/>
@@ -16322,20 +16958,20 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="FID" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="FID" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="FID" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="431" type="field" name="type"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16371,8 +17007,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16380,7 +17016,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -16446,7 +17082,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16471,612 +17107,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,207,80,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="190,207,80,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open"/>
-          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking"/>
-          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed"/>
-          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way"/>
-          <rule symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures"/>
+          <rule label="Road Open" symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule label="No Parking" symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule label="Lane Closed" symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule label="One-Way" symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule label="Road Closures" symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="2" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="2"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@0" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,255,0,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="2" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="2;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash dot dot" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="2;1;1;1"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@2@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="3" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{07696f80-e7db-403b-b380-82695a86ae34}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="3;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="3;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="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@3@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{e24fa060-35e4-4c51-b944-426558636610}">
+                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="4" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="255,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17085,151 +17721,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" fieldName="times" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Regular" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="times" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="4294967295" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="2" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{27379576-e711-4788-850d-75df56ba927b}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17237,16 +17873,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17283,10 +17919,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
+        <alias name="" index="2" field="status"/>
+        <alias name="" index="3" field="times"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -17301,28 +17937,28 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="times" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="status" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="times" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="status" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="times" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="202" type="field" name="type"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="status"/>
-          <column hidden="0" width="-1" type="field" name="times"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17360,10 +17996,10 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17371,7 +18007,1494 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+      <extent>
+        <xmin>18.37568387427754857</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.9003177544488068</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37568387427754857</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.9003177544488068</ymax>
+      </wgs84extent>
+      <id>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>route_markers</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <dates/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="">memory</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <metadataUrls/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+        <data-defined-properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </data-defined-properties>
+        <profileLineSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
+              <Option type="Map">
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileLineSymbol>
+        <profileFillSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+              <Option type="Map">
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileFillSymbol>
+        <profileMarkerSymbol>
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties"/>
+                <Option name="type" type="QString" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+              <Option type="Map">
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </profileMarkerSymbol>
+      </elevation>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <labeling type="rule-based">
+        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
+            <settings calloutType="simple">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <families/>
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <Option type="Map">
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
+            <settings calloutType="simple">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <families/>
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <Option type="Map">
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option name="name" type="QString" value=""/>
+                        <Option name="properties"/>
+                        <Option name="type" type="QString" value="collection"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <Option type="Map">
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
+                            </Option>
+                          </Option>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </background>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <dd_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
+                    </Option>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
+                    </Option>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
+                    </Option>
+                  </Option>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </dd_properties>
+              <callout type="simple">
+                <Option type="Map">
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
+                        </Option>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
+                        </Option>
+                      </Option>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                        <Option type="Map">
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="190,178,151,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
+              <settings calloutType="simple">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                  <families/>
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                        <Option type="Map">
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties"/>
+                          <Option name="type" type="QString" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                        <Option type="Map">
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option name="name" type="QString" value=""/>
+                            <Option name="properties"/>
+                            <Option name="type" type="QString" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
+                      </Option>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
+                      </Option>
+                    </Option>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <callout type="simple">
+                  <Option type="Map">
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties"/>
+                      <Option name="type" type="QString" value="collection"/>
+                    </Option>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+          </rule>
+        </rules>
+      </labeling>
+      <customproperties>
+        <Option type="Map">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+          </Option>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
+        </Option>
+      </customproperties>
+      <blendMode>0</blendMode>
+      <featureBlendMode>0</featureBlendMode>
+      <layerOpacity>1</layerOpacity>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+          <axisSymbol>
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties"/>
+                  <Option name="type" type="QString" value="collection"/>
+                </Option>
+              </data_defined_properties>
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+                <Option type="Map">
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties"/>
+                    <Option name="type" type="QString" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+        <properties>
+          <Option type="Map">
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties"/>
+            <Option name="type" type="QString" value="collection"/>
+          </Option>
+        </properties>
+      </DiagramLayerSettings>
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+        <activeChecks/>
+        <checkConfiguration/>
+      </geometryOptions>
+      <legend type="default-vector" showLabelLegend="0"/>
+      <referencedLayers/>
+      <fieldConfiguration>
+        <field name="Name" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="begin" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="end" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="RouteLen" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Sort" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_km" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="length_m" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="org_fid" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="distance" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
+              </Option>
+            </config>
+          </editWidget>
+        </field>
+        <field name="quadrant" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+      </fieldConfiguration>
+      <aliases>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
+        <alias name="" index="10" field="org_fid"/>
+        <alias name="" index="11" field="distance"/>
+        <alias name="" index="12" field="quadrant"/>
+      </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+        <policy policy="Duplicate" field="quadrant"/>
+      </splitPolicies>
+      <defaults>
+        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Sort" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="quadrant" applyOnUpdate="0"/>
+      </defaults>
+      <constraints>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="quadrant" exp_strength="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="quadrant" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      </attributeactions>
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+        <columns>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="quadrant" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+        </columns>
+      </attributetableconfig>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <storedexpressions/>
+      <editform tolerant="1"></editform>
+      <editforminit/>
+      <editforminitcodesource>0</editforminitcodesource>
+      <editforminitfilepath>.</editforminitfilepath>
+      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
+"""
+QGIS forms can have a Python function that is called when the form is
+opened.
+
+Use this function to add extra logic to your forms.
+
+Enter the name of the function in the "Python Init function"
+field.
+An example follows:
+"""
+from qgis.PyQt.QtWidgets import QWidget
+
+def my_form_open(dialog, layer, feature):
+	geom = feature.geometry()
+	control = dialog.findChild(QWidget, "MyLineEdit")
+]]></editforminitcode>
+      <featformsuppress>0</featformsuppress>
+      <editorlayout>generatedlayout</editorlayout>
+      <editable>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
+      </editable>
+      <labelOnTop>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
+      </labelOnTop>
+      <reuseLastValue>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
+      </reuseLastValue>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+      <mapTip enabled="1">Text</mapTip>
+    </maplayer>
+    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.37569549706161354</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -17445,1020 +19568,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
             <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" description="List for legends">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" description="21KM">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" description="10KM">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" description="5KM">
+            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="190,178,151,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="190,178,151,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" description="Trail">
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
               <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
+                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -18468,68 +20591,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18537,16 +20660,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18557,8 +20680,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18567,8 +20690,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18577,8 +20700,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18587,8 +20710,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18597,8 +20720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18621,8 +20744,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18631,8 +20754,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18641,8 +20764,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18651,8 +20774,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -18661,26 +20784,26 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="begin" index="1" name=""/>
-        <alias field="end" index="2" name=""/>
-        <alias field="Distance" index="3" name=""/>
-        <alias field="RouteLen" index="4" name=""/>
-        <alias field="Sort" index="5" name=""/>
-        <alias field="day" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="length_m" index="9" name=""/>
-        <alias field="org_fid" index="10" name=""/>
-        <alias field="distance" index="11" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
+        <alias name="" index="10" field="org_fid"/>
+        <alias name="" index="11" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -18711,55 +20834,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="org_fid"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="0" width="-1" type="field" name="Source"/>
-          <column hidden="0" width="-1" type="field" name="RouteLen"/>
-          <column hidden="0" width="-1" type="field" name="descriptio"/>
-          <column hidden="0" width="-1" type="field" name="timestamp"/>
-          <column hidden="0" width="-1" type="field" name="begin"/>
-          <column hidden="0" width="-1" type="field" name="end"/>
-          <column hidden="0" width="-1" type="field" name="Distance"/>
-          <column hidden="0" width="-1" type="field" name="length_km"/>
-          <column hidden="0" width="-1" type="field" name="Sort"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="quadrant"/>
-          <column hidden="0" width="-1" type="field" name="length_m"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="quadrant" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18808,1562 +20931,45 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
-      <extent>
-        <xmin>18.37567806397844095</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37567806397844095</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </wgs84extent>
-      <id>route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <dates/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option value="" type="QString" name="name"/>
-            <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
-              <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
-              <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
-              <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
-      <labeling type="rule-based">
-        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
-            <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
-            <settings calloutType="simple">
-              <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
-                        <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                      <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
-                            </Option>
-                          </Option>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
-                    </Option>
-                  </Option>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" description="List for legends">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" description="21KM">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="3" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" description="10KM">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
-                        </Option>
-                      </Option>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" description="5KM">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="190,178,151,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" description="Trail">
-              <settings calloutType="simple">
-                <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="1" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="255,255,255,255">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                  <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeOffsetY="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="1">
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
-                          <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                        <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
-                            <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-                <placement allowDegraded="1" centroidWhole="0" dist="2" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="6" distUnits="MM" maxCurvedCharAngleOut="-20" layerType="PointGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="10" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="AllowOverlapIfRequired" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMaxPixelSize="10000" obstacleFactor="2" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
-                      </Option>
-                    </Option>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
-                      <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
-                    </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
-          </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
-          <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
-                <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
-        <properties>
-          <Option type="Map">
-            <Option value="" type="QString" name="name"/>
-            <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Sort" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="quadrant" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
-      </aliases>
-      <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-        <policy policy="Duplicate" field="quadrant"/>
-      </splitPolicies>
-      <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="quadrant" exp_strength="0" constraints="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
-        <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="org_fid"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="0" width="-1" type="field" name="Source"/>
-          <column hidden="0" width="-1" type="field" name="RouteLen"/>
-          <column hidden="0" width="-1" type="field" name="descriptio"/>
-          <column hidden="0" width="-1" type="field" name="timestamp"/>
-          <column hidden="0" width="-1" type="field" name="begin"/>
-          <column hidden="0" width="-1" type="field" name="end"/>
-          <column hidden="0" width="-1" type="field" name="Distance"/>
-          <column hidden="0" width="-1" type="field" name="length_km"/>
-          <column hidden="0" width="-1" type="field" name="Sort"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="-1" type="field" name="quadrant"/>
-          <column hidden="0" width="-1" type="field" name="length_m"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
-      </editable>
-      <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Sort"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="quadrant"/>
-        <field labelOnTop="0" name="timestamp"/>
-      </labelOnTop>
-      <reuseLastValue>
-        <field reuseLastValue="0" name="Distance"/>
-        <field reuseLastValue="0" name="Name"/>
-        <field reuseLastValue="0" name="RouteLen"/>
-        <field reuseLastValue="0" name="Sort"/>
-        <field reuseLastValue="0" name="Source"/>
-        <field reuseLastValue="0" name="begin"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="descriptio"/>
-        <field reuseLastValue="0" name="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip enabled="1">Text</mapTip>
-    </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -20437,173 +21043,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20614,18 +21220,18 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -20655,9 +21261,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="area"/>
+        <alias name="" index="2" field="rotation"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -20670,25 +21276,25 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="rotation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="area" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="rotation" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="area" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="rotation" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="area"/>
-          <column hidden="0" width="-1" type="field" name="rotation"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20711,7 +21317,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -20777,7 +21383,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20802,195 +21408,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
+          <rule label="All distances" symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
+            <layer locked="1" pass="0" enabled="1" class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,0"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21002,70 +21608,70 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="StringList" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="StringList">
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21073,16 +21679,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21114,8 +21720,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21131,8 +21737,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21141,8 +21747,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21191,19 +21797,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="descriptio"/>
+        <alias name="" index="2" field="timestamp"/>
+        <alias name="" index="3" field="begin"/>
+        <alias name="" index="4" field="end"/>
+        <alias name="" index="5" field="RouteLen"/>
+        <alias name="" index="6" field="Source"/>
+        <alias name="" index="7" field="length_m"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="org_fid"/>
+        <alias name="" index="10" field="distance"/>
+        <alias name="" index="11" field="first_runn"/>
+        <alias name="" index="12" field="last_runne"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -21236,55 +21842,55 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="last_runne" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="first_runn" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="last_runne" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="descriptio" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="timestamp" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="first_runn" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="last_runne" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="179" type="field" name="begin"/>
-          <column hidden="0" width="-1" type="field" name="RouteLen"/>
-          <column hidden="0" width="-1" type="field" name="Source"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="Name"/>
-          <column hidden="0" width="-1" type="field" name="length_m"/>
-          <column hidden="0" width="-1" type="field" name="length_km"/>
-          <column hidden="0" width="-1" type="field" name="org_fid"/>
-          <column hidden="0" width="-1" type="field" name="first_runn"/>
-          <column hidden="0" width="-1" type="field" name="last_runne"/>
-          <column hidden="0" width="-1" type="field" name="descriptio"/>
-          <column hidden="0" width="-1" type="field" name="timestamp"/>
-          <column hidden="0" width="-1" type="field" name="end"/>
-          <column hidden="0" width="-1" type="field" name="distance"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="first_runn" hidden="0" type="field"/>
+          <column width="-1" name="last_runne" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21343,31 +21949,31 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Distance"/>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="RouteLen"/>
-        <field labelOnTop="0" name="Source"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="begin"/>
-        <field labelOnTop="0" name="descriptio"/>
-        <field labelOnTop="0" name="display"/>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="distance_1"/>
-        <field labelOnTop="0" name="end"/>
-        <field labelOnTop="0" name="first_run"/>
-        <field labelOnTop="0" name="first_runn"/>
-        <field labelOnTop="0" name="first_runner"/>
-        <field labelOnTop="0" name="first_runner_s"/>
-        <field labelOnTop="0" name="last_run"/>
-        <field labelOnTop="0" name="last_runn"/>
-        <field labelOnTop="0" name="last_runne"/>
-        <field labelOnTop="0" name="last_runner"/>
-        <field labelOnTop="0" name="last_runner_s"/>
-        <field labelOnTop="0" name="length_km"/>
-        <field labelOnTop="0" name="length_m"/>
-        <field labelOnTop="0" name="org_fid"/>
-        <field labelOnTop="0" name="timestamp"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="display" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="distance_1" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="first_run" labelOnTop="0"/>
+        <field name="first_runn" labelOnTop="0"/>
+        <field name="first_runner" labelOnTop="0"/>
+        <field name="first_runner_s" labelOnTop="0"/>
+        <field name="last_run" labelOnTop="0"/>
+        <field name="last_runn" labelOnTop="0"/>
+        <field name="last_runne" labelOnTop="0"/>
+        <field name="last_runner" labelOnTop="0"/>
+        <field name="last_runner_s" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21375,7 +21981,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiLineString" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Line" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="0" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -21449,326 +22055,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
-          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
+          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="0" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="1" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <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="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
+            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <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="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="@1@1" is_animated="0">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
+                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,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="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="@@1@1@0" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -21781,66 +22387,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21848,16 +22454,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="2" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21880,8 +22486,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="type"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -21892,22 +22498,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="type"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21943,8 +22549,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21952,7 +22558,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="Point" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Point" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22026,291 +22632,291 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textOpacity="1" fontSize="15" multilineHeightUnit="Percentage" fieldName="label" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Semibold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="15" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-          <placement allowDegraded="0" centroidWhole="0" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" quadOffset="4" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="0" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMaxPixelSize="10000" obstacleFactor="1" obstacleType="0" zIndex="0" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="0" scaleMin="0" mergeLines="0" labelPerPart="0"/>
+          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
+          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="0" underline="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22318,16 +22924,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="18" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22350,8 +22956,8 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="label"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -22362,22 +22968,22 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="label" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="0" width="-1" type="field" name="label"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22413,8 +23019,8 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22422,7 +23028,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer wkbType="MultiPolygon" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" geometry="Polygon" simplifyAlgorithm="0" simplifyMaxScale="1" labelsEnabled="1" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" simplifyDrawingHints="1" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" minScale="100000000" type="vector" symbologyReferenceScale="-1">
+    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -22488,7 +23094,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" maxx="0" maxz="0" minx="0" dimensions="2" miny="0" maxy="0"/>
+          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22513,267 +23119,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fixedDuration="0" enabled="0" startExpression="" durationUnit="min" endField="" limitMode="0" accumulate="0" startField="" durationField="" mode="0" endExpression="">
+      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusionEnabled="0" symbology="Line" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" extrusion="0" showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" respectLayerSymbol="1">
+      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" type="nullSymbol" enableorderby="0"/>
+      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style textOpacity="0.90000000000000002" fontSize="8" multilineHeightUnit="Percentage" fieldName="label" multilineHeight="1" fontWeight="75" fontSizeUnit="Point" legendString="Aa" fontLetterSpacing="0" capitalization="0" isExpression="0" fontUnderline="0" namedStyle="Bold" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" useSubstitutions="0" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="31,120,180,255">
+              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="31,120,180,255" forcedBold="0" multilineHeight="1" namedStyle="Bold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
                 <families/>
-                <text-buffer bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="0.75" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-                <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeOpacity="0.59999999999999998" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="1" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeOffsetY="-0.14999999999999999" shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0.75">
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="markerSymbol" is_animated="0">
+                <text-buffer bufferBlendMode="0" bufferSize="0.75" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,204" shapeOffsetUnit="MM" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeJoinStyle="64" shapeSizeY="0.29999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,204" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.75" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,204"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="31,120,206,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.75"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="1" reverseDirectionSymbol="0" wrapChar="" plussign="0" autoWrapLength="0" rightDirectionSymbol=">" decimals="3" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0"/>
-              <placement allowDegraded="0" centroidWhole="1" dist="0" fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" preserveRotation="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" quadOffset="1" overrunDistance="0" repeatDistanceUnits="MM" placement="0" distUnits="MM" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" priority="5" lineAnchorTextPoint="CenterOfText" offsetType="0" geometryGenerator="" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGeneratorEnabled="0" lineAnchorClipping="0" repeatDistance="0" centroidInside="0" yOffset="0" xOffset="1" lineAnchorType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overlapHandling="PreventOverlap" placementFlags="10" polygonPlacementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMaxPixelSize="10000" obstacleFactor="0.76000000000000001" obstacleType="0" zIndex="5" limitNumLabels="0" fontLimitPixelSize="0" maxNumLabels="6" upsidedownLabels="0" fontMinPixelSize="3" drawLabels="1" scaleVisibility="0" unplacedVisibility="0" minFeatureSize="0" obstacle="1" scaleMax="10000000" scaleMin="1" mergeLines="0" labelPerPart="0"/>
+              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
+              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="1" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" dist="0" xOffset="1" lineAnchorClipping="0" distUnits="MM" layerType="PolygonGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="6" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.76000000000000001" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&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 name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -22782,72 +23388,72 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory labelPlacementMethod="XHeight" showAxis="0" penColor="#000000" opacity="1" lineSizeType="MM" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" direction="1" penAlpha="255" rotationOffset="270" backgroundAlpha="255" minimumSize="0" spacing="0" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" spacingUnit="MM" barWidth="5" backgroundColor="#ffffff" sizeType="MM" diagramOrientation="Up" scaleDependency="Area" height="15" width="15" enabled="0" lineSizeScale="3x:0,0,0,0,0,0">
-          <fontProperties bold="0" style="" underline="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0"/>
-          <attribute colorOpacity="1" field="" color="#000000" label=""/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
+          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute colorOpacity="1" label="" color="#000000" field=""/>
           <axisSymbol>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22855,22 +23461,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings dist="0" zIndex="0" priority="0" placement="0" obstacle="0" linePlacementFlags="2" showAll="1">
+      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -22881,8 +23487,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22891,8 +23497,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22901,8 +23507,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -22923,11 +23529,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="table_set"/>
+        <alias name="" index="2" field="label"/>
+        <alias name="" index="3" field="races"/>
+        <alias name="" index="4" field="day"/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -22944,31 +23550,31 @@ def my_form_open(dialog, layer, feature):
         <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="table_set" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="label" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="races" exp_strength="0" constraints="0"/>
-        <constraint unique_strength="0" notnull_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="table_set" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="races" exp_strength="0"/>
+        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column hidden="0" width="-1" type="field" name="id"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column hidden="0" width="-1" type="field" name="table_set"/>
-          <column hidden="0" width="-1" type="field" name="label"/>
-          <column hidden="0" width="-1" type="field" name="day"/>
-          <column hidden="0" width="130" type="field" name="races"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23007,18 +23613,18 @@ def my_form_open(dialog, layer, feature):
         <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="day"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="label"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="table_set"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="label" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="table_set" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -23052,8 +23658,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43"/>
     <layer id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+    <layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
+    <layer id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -23222,7 +23829,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230907 - Gun Run 2023 - Marshal Plan 1.4.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes/20230907 - Gun Run 2023 - Routes 1.7.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -23391,367 +23998,319 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" type="QString" name="name"/>
+      <Option name="name" type="QString" value=""/>
       <Option name="properties"/>
-      <Option value="collection" type="QString" name="type"/>
+      <Option name="type" type="QString" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer visible="1" expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Cones" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
+      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Fencing" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - inset" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - main" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal plan" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+    <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
+      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
       <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
+      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="0" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
+      <layer visible="1" expanded="1" style="default" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+      <expanded-legend-nodes id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer visible="1" style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer visible="1" style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" style="default" expanded="1" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -23774,90 +24333,90 @@ def my_form_open(dialog, layer, feature):
     </contact>
     <links/>
     <dates>
-      <date value="2000-01-01T00:00:00" type="Created"/>
+      <date type="Created" value="2000-01-01T00:00:00"/>
     </dates>
     <author>Timothy Allen</author>
     <creation>2000-01-01T00:00:00</creation>
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" units="mm" name="Marshals" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Marshals" printResolution="120" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23865,15 +24424,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="132.391,187.018,mm" id="" opacity="1" referencePoint="0" sectionWidth="132.391" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="184.8" outlineWidthM="0.3,mm" zValue="6" frame="false" positionOnPage="158.226,6.0007,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" position="158.226,6.0007,mm" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" id="" positionLock="true" zValue="6" position="158.226,6.0007,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="184.8" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="132.391" excludeFromExports="0" positionOnPage="158.226,6.0007,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="132.391,187.018,mm" itemRotation="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23881,15 +24440,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="20.4703,32.2333,mm" id="" title="" zValue="5" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionOnPage="128.508,3.98741,mm" blendMode="0" referencePoint="0" frameJoinStyle="bevel" minSymbolSize="0" positionLock="true" outlineWidthM="0.1,mm" maxSymbolSize="0" columnSpace="2" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" position="128.508,3.98741,mm" columnCount="1">
-        <FrameColor blue="128" green="128" alpha="255" red="128"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="5" resizeToContents="1" frame="true" blendMode="0" positionOnPage="128.508,3.98741,mm" size="20.4703,32.2333,mm" background="true" groupUuid="" frameJoinStyle="bevel" position="128.508,3.98741,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="128" alpha="255" green="128" blue="128"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23900,242 +24459,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="11" multilineHeightUnit="MM" multilineHeight="4.8805579999999997" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.8805579999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="MM" multilineHeight="4.1750019999999992" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="1" name="subgroup" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.1750019999999992" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbol" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="8" multilineHeightUnit="MM" multilineHeight="3.8222239999999998" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="3.8222239999999998" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -24145,17 +24704,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -24163,166 +24722,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.5192,54.5647,mm" id="Inset map" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.2,mm" mapRotation="0" isTemporal="0" zValue="3" frame="true" positionOnPage="98.7828,149.027,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal map - inset" position="98.7828,149.027,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Inset map" positionLock="true" zValue="3" isTemporal="0" followPreset="true" mapRotation="0" position="98.7828,149.027,mm" blendMode="0" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.2,mm" excludeFromExports="0" positionOnPage="98.7828,149.027,mm" followPresetName="Marshal map - inset" type="65639" size="56.5192,54.5647,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3917833749645645" ymax="-33.90659215121308279" ymin="-33.91073582826823696" xmax="18.39607548048533303"/>
+        <Extent xmax="18.39607548048533303" xmin="18.3917833749645645" ymin="-33.91073582826823696" ymax="-33.90659215121308279"/>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24330,34 +24889,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="1" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" blendMode="0" position="3" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" show="1">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,65,170,127" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,102" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,65,170,127"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,102"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24365,9 +24924,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24377,171 +24936,171 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="142,187.018,mm" id="Main map" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="2" frame="false" positionOnPage="3.53,6.0007,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal map - main" position="3.53,6.0007,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Main map" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="3.53,6.0007,mm" blendMode="0" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.53,6.0007,mm" followPresetName="Marshal map - main" type="65639" size="142,187.018,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39341592405077463" ymax="-33.90798769129818879" ymin="-33.90934028818313095" xmax="18.3944429313991229"/>
+        <Extent xmax="18.3944429313991229" xmin="18.39341592405077463" ymin="-33.90934028818313095" ymax="-33.90798769129818879"/>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24551,26 +25110,26 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="47.1065,27.6,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../GunRun2023_500.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="1" frame="false" positionOnPage="246.665,178.41,mm" itemRotation="0" position="246.665,178.41,mm" pictureWidth="47.1065" groupUuid="" pictureHeight="26.6623" anchorPoint="0" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="26.6623" zValue="1" anchorPoint="0" northMode="0" pictureRotation="0" position="246.665,178.41,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="246.665,178.41,mm" pictureWidth="47.1065" type="65640" size="47.1065,27.6,mm" file="../GunRun2023_500.png" itemRotation="0" resizeMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24578,14 +25137,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" resizeMode="0" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
         <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24595,112 +25154,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="bool" name="imageAntialias"/>
-          <Option value="0" type="int" name="imageCropMarginBottom"/>
-          <Option value="0" type="int" name="imageCropMarginLeft"/>
-          <Option value="0" type="int" name="imageCropMarginRight"/>
-          <Option value="0" type="int" name="imageCropMarginTop"/>
-          <Option value="0" type="QString" name="imageCropMarginUnit"/>
-          <Option value="false" type="bool" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="rasterize"/>
-          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
-          <Option value="false" type="bool" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="bool" value="true"/>
+          <Option name="imageCropMarginBottom" type="int" value="0"/>
+          <Option name="imageCropMarginLeft" type="int" value="0"/>
+          <Option name="imageCropMarginRight" type="int" value="0"/>
+          <Option name="imageCropMarginTop" type="int" value="0"/>
+          <Option name="imageCropMarginUnit" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="bool" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="false"/>
+          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
+          <Option name="singleFile" type="bool" value="false"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" pageNameExpression="&quot;position&quot;" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerName="marshal_positions" hideCoverage="0" sortKey="&quot;id&quot;"/>
+      <Atlas coverageLayerName="marshal_positions" filterFeatures="0" sortKey="&quot;id&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" pageNameExpression="&quot;position&quot;" enabled="1" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" name="Start &amp; Finish Backgrounds" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24708,21 +25267,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="330" size="9.45865,11,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" file="arrows/NorthArrow_11.svg" resizeMode="0" svgBorderWidth="0.2" mode="0" zValue="4" frame="false" positionOnPage="286.027,2,mm" itemRotation="0" position="286.027,2,mm" pictureWidth="6.31767" groupUuid="" pictureHeight="7.97477" anchorPoint="0" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="0" id="" positionLock="true" pictureHeight="7.97477" zValue="4" anchorPoint="0" northMode="0" pictureRotation="330" position="286.027,2,mm" blendMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="286.027,2,mm" pictureWidth="6.31767" type="65640" size="9.45865,11,mm" file="arrows/NorthArrow_11.svg" itemRotation="0" resizeMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24730,476 +25289,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="142.543,10.3185,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="3" frame="false" marginX="1" positionOnPage="285.027,205.886,mm" labelText="[%upper( &quot;area&quot; )%]" itemRotation="270" position="285.027,205.886,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="3" marginY="1" position="285.027,205.886,mm" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" referencePoint="0" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="285.027,205.886,mm" type="65641" htmlState="0" size="142.543,10.3185,mm" itemRotation="270" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" itemRotation="0" height="3" unitLabel="m" numSegments="4" alignment="0" size="145.54,16.2165,mm" id="" unitType="meters" zValue="2" subdivisionsHeight="1.5" labelBarSpace="3" positionOnPage="7,189.669,mm" labelHorizontalPlacement="0" blendMode="0" referencePoint="0" segmentMillimeters="26.3519" numUnitsPerSegment="100" frameJoinStyle="miter" style="Single Box" labelVerticalPlacement="0" positionLock="true" segmentSizeMode="1" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" background="false" lineJoinStyle="miter" boxContentSpace="1" numSubdivisions="1" excludeFromExports="0" opacity="1" maxBarWidth="150" numSegmentsLeft="2" visibility="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" minBarWidth="50" outlineWidth="0.3" frame="false" lineCapStyle="square" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="miter" numUnitsPerSegment="100" unitLabel="m" lineCapStyle="square" unitType="meters" height="3" labelBarSpace="3" positionLock="true" minBarWidth="50" labelVerticalPlacement="0" numSegments="4" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelHorizontalPlacement="0" segmentMillimeters="26.3519" style="Single Box" referencePoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="7,189.669,mm" size="145.54,16.2165,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.3" frameJoinStyle="miter" position="7,189.669,mm" visibility="1" excludeFromExports="0" boxContentSpace="1" subdivisionsHeight="1.5" alignment="0" maxBarWidth="150">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" alpha="255" red="0"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="invalid" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option type="invalid" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" alpha="255" red="0"/>
-        <fillColor2 blue="255" green="255" alpha="255" red="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="278.027,180.318,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="330" isTemporal="0" zValue="1" frame="false" positionOnPage="7,5.5,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Start/Finish" position="7,5.5,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="330" position="7,5.5,mm" blendMode="0" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="7,5.5,mm" followPresetName="Start/Finish" type="65639" size="278.027,180.318,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="rotation" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="id" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
+        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="5" annotationFormat="4" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="3" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" unit="1" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="5" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25216,58 +25775,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25277,115 +25836,115 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
-          <Option value="0" type="QString" name="svgCropMarginBottom"/>
-          <Option value="0" type="QString" name="svgCropMarginLeft"/>
-          <Option value="0" type="QString" name="svgCropMarginRight"/>
-          <Option value="0" type="QString" name="svgCropMarginTop"/>
-          <Option value="true" type="QString" name="svgCropToContents"/>
-          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
-          <Option value="false" type="QString" name="svgGroupLayers"/>
-          <Option value="1" type="QString" name="svgIncludeMetadata"/>
-          <Option value="0" type="QString" name="svgTextFormat"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
+          <Option name="svgCropMarginBottom" type="QString" value="0"/>
+          <Option name="svgCropMarginLeft" type="QString" value="0"/>
+          <Option name="svgCropMarginRight" type="QString" value="0"/>
+          <Option name="svgCropMarginTop" type="QString" value="0"/>
+          <Option name="svgCropToContents" type="QString" value="true"/>
+          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
+          <Option name="svgGroupLayers" type="QString" value="false"/>
+          <Option name="svgIncludeMetadata" type="QString" value="1"/>
+          <Option name="svgTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerName="start_finish_area" hideCoverage="1" sortKey="area"/>
+      <Atlas coverageLayerName="start_finish_area" filterFeatures="0" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" pageNameExpression="&quot;area&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" name="Fencing" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Cones" printResolution="300" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25393,15 +25952,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="38.1563,67.2879,mm" id="" title="" zValue="11" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionOnPage="256.808,5.21277,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="0" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" position="256.808,5.21277,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,67.2879,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25412,242 +25971,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="group" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -25657,33 +26216,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./fencing.shp|layername=fencing" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -25691,77 +26250,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="148.46,6.45211,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="10" frame="false" marginX="0" positionOnPage="6.76779,191.188,mm" labelText="FENCING: [% &quot;name&quot; %]" itemRotation="0" position="6.76779,191.188,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="CONES: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.3557,6.45237,mm" id="" opacity="1" referencePoint="0" sectionWidth="56.3557" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="5.76" outlineWidthM="0.3,mm" zValue="9" frame="false" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" position="182.723,191.188,mm" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25769,269 +26328,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="26.8205,6.82826,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="8" frame="false" marginX="0" positionOnPage="209.146,198.083,mm" labelText="REVISION 3.0" itemRotation="0" position="209.146,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="51.1638,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="62.6706,198.083,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" position="62.6706,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="6" marginY="0" position="116.805,198.083,mm" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="116.805,198.083,mm" type="65641" htmlState="0" size="64.7594,7.10512,mm" itemRotation="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="64.7594,7.10512,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="6" frame="false" marginX="0" positionOnPage="116.805,198.083,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" position="116.805,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="52.7903,7.07327,mm" itemRotation="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="52.7903,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="5" frame="false" marginX="0" positionOnPage="6.76779,198.083,mm" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" position="6.76779,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
-          <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="49.3143,29.8354,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../GunRun2022_250.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="243.098,175.353,mm" itemRotation="0" position="243.098,175.353,mm" pictureWidth="29.6535" groupUuid="" pictureHeight="29.8354" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26039,380 +26536,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="232.01,0.14328,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" position="6.91779,197.79,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem groupUuid="" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" itemRotation="0" height="2" unitLabel="m" numSegments="2" alignment="0" size="109.51,15.8378,mm" id="" unitType="meters" zValue="2" subdivisionsHeight="1.5" labelBarSpace="1" positionOnPage="6.76779,2.8482,mm" labelHorizontalPlacement="0" blendMode="0" referencePoint="0" segmentMillimeters="33.2496" numUnitsPerSegment="20" frameJoinStyle="miter" style="Double Box" labelVerticalPlacement="0" positionLock="true" segmentSizeMode="1" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" background="false" lineJoinStyle="round" boxContentSpace="0.2" numSubdivisions="1" excludeFromExports="0" opacity="1" maxBarWidth="100" numSegmentsLeft="2" visibility="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" minBarWidth="25" outlineWidth="0.2" frame="false" lineCapStyle="square" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="500" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelHorizontalPlacement="0" segmentMillimeters="30.2878" style="Double Box" referencePoint="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="104.399,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" alpha="255" red="0"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="invalid" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option type="invalid" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" alpha="255" red="0"/>
-        <fillColor2 blue="255" green="255" alpha="255" red="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="283.418,180.92,mm" id="" opacity="0.9" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Fencing" position="6.76779,9.35102,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40368928312333452" ymax="-33.90720180625849167" ymin="-33.90817940102677852" xmax="18.40522072458854552"/>
+        <Extent xmax="18.40002634434715745" xmin="18.35799642373467222" ymin="-33.94965747213089458" ymax="-33.92282769675949083"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -26427,92 +26924,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="5" annotationFormat="4" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="3" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" unit="1" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="5" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26529,58 +27026,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26590,19 +27087,19 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" url="" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" url="" resizeMode="0" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26612,250 +27109,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerName="fence_and_cone_groups" hideCoverage="1" sortKey="&quot;group&quot;"/>
+      <Atlas coverageLayerName="cone_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="9" offsetY="0"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="9" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="false" size="83.9998,10.4638,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="1" positionOnPage="4.43449,186.634,mm" labelText="Directions to Start of Race" itemRotation="0" position="4.43449,186.634,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="8" marginY="1" position="4.43449,186.634,mm" blendMode="0" labelText="Directions to Start of Race" referencePoint="0" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,186.634,mm" type="65641" htmlState="0" size="83.9998,10.4638,mm" itemRotation="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="14" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="48.2923,9.511,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="4.43449,197.498,mm" labelText="Gun Run" itemRotation="0" position="4.43449,197.498,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="7" marginY="1" position="4.43449,197.498,mm" blendMode="0" labelText="Gun Run" referencePoint="0" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,197.498,mm" type="65641" htmlState="0" size="48.2923,9.511,mm" itemRotation="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="0" symbolHeight="5" boxSpace="2" symbolWidth="9" titleAlignment="1" rasterBorderColor="0,0,0,255" size="59.0766,76,mm" id="" title="" zValue="6" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionOnPage="10.096,10.8563,mm" blendMode="0" referencePoint="0" legendFilterByMap="1" frameJoinStyle="round" minSymbolSize="0" positionLock="false" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" position="10.096,10.8563,mm" columnCount="1">
-        <FrameColor blue="139" green="139" alpha="255" red="139"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="9" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="5" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="0" legendFilterByMap="1" positionLock="false" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="true" blendMode="0" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" background="true" groupUuid="" frameJoinStyle="round" position="10.096,10.8563,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="139" alpha="255" green="139" blue="139"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26866,242 +27363,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="16" multilineHeightUnit="MM" multilineHeight="7.6444479999999997" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="7.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="6.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="6.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="subgroup" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2.5" marginLeft="3">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="6.9388920000000001" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbolLabel" indent="0" marginLeft="3">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27111,32 +27608,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
+          <layer-tree-group expanded="1" name="Ask Me" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" type="QString" name="legend/title-style"/>
+                <Option name="legend/title-style" type="QString" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" name="poi_labels" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
-                  <Option value="Toilets" type="QString" name="legend/label-1"/>
-                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
-                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
-                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
-                  <Option value="Parking" type="QString" name="legend/label-5"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
+                  <Option name="legend/label-1" type="QString" value="Toilets"/>
+                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
+                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
+                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
+                  <Option name="legend/label-5" type="QString" value="Parking"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" name="directions_to_start" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
-                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
-                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
+                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
+                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27144,145 +27641,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="27.7839,6.871,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="221.862,190.027,mm" labelText="REVISION 1.0" itemRotation="0" position="221.862,190.027,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="5" marginY="1" position="221.862,190.027,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="221.862,190.027,mm" type="65641" htmlState="0" size="27.7839,6.871,mm" itemRotation="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="51.6706,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="4" frame="false" marginX="1" positionOnPage="197.975,197.498,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="197.975,197.498,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="4" marginY="1" position="197.975,197.498,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="197.975,197.498,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" pictureRotation="0" size="42.9838,24.3824,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="3" frame="false" positionOnPage="249.646,179.724,mm" itemRotation="0" position="249.646,179.724,mm" pictureWidth="24.2337" groupUuid="" pictureHeight="24.3824" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="false" pictureHeight="24.3824" zValue="3" anchorPoint="4" northMode="0" pictureRotation="0" position="249.646,179.724,mm" blendMode="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="249.646,179.724,mm" pictureWidth="24.2337" type="65640" size="42.9838,24.3824,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27290,85 +27787,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="244.912,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="2" frame="false" shapeType="1" positionOnPage="4.58449,197.248,mm" itemRotation="0" position="4.58449,197.248,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="false" zValue="2" position="4.58449,197.248,mm" blendMode="0" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" type="65643" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" itemRotation="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{25dc84af-8724-465b-a42c-c6c013132998}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="288.007,183.616,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="4.43449,6.411,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Ask Me" position="4.43449,6.411,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="4.43449,6.411,mm" blendMode="0" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="4.43449,6.411,mm" followPresetName="Ask Me" type="65639" size="288.007,183.616,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
+        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -27383,149 +27880,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27535,316 +28032,316 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" sortFeatures="0" pageNameExpression="" filterFeatures="0" coverageLayer="" hideCoverage="0"/>
+      <Atlas filterFeatures="0" coverageLayer="" hideCoverage="0" pageNameExpression="" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Routes" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" name="Routes" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="61.5373,6.8714,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="13" frame="false" marginX="0" positionOnPage="200.171,199.082,mm" labelText="REVISION 1.5" itemRotation="0" position="200.171,199.082,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="13" marginY="0" position="200.171,199.082,mm" blendMode="0" labelText="REVISION 1.6" referencePoint="0" valign="32" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="200.171,199.082,mm" type="65641" htmlState="0" size="61.5373,6.8714,mm" itemRotation="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="61.5373,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="12" frame="false" marginX="0" positionOnPage="9.7863,192.073,mm" labelText="Gun Run 2023: [%&quot;Source&quot;%]" itemRotation="0" position="9.7863,192.073,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="12" marginY="0" position="9.7863,192.073,mm" blendMode="0" labelText="Gun Run 2023: [%&quot;Source&quot;%]" referencePoint="0" valign="64" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,192.073,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="61.5373,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="11" frame="false" marginX="0" positionOnPage="9.7863,199.082,mm" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" itemRotation="0" position="9.7863,199.082,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="11" marginY="0" position="9.7863,199.082,mm" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" referencePoint="0" valign="32" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,199.082,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="10" frame="false" positionOnPage="262.196,188.218,mm" itemRotation="0" position="262.196,188.218,mm" pictureWidth="29.7523" groupUuid="" pictureHeight="16.8993" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="16.8993" zValue="10" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="29.7523" type="65640" size="29.7523,17.4718,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27852,464 +28349,374 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="251.982,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="9" frame="false" shapeType="1" positionOnPage="9.57644,198.832,mm" itemRotation="0" position="9.57644,198.832,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="9" position="9.57644,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.57644,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" itemRotation="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="109.221,188.689,mm" id="Trail Finish" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="8" frame="true" positionOnPage="8.21644,4.09761,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="8.21644,4.09761,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Finish" positionLock="true" zValue="8" isTemporal="0" followPreset="true" mapRotation="0" position="8.21644,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="8.21644,4.09761,mm" followPresetName="Routes" type="65639" size="109.221,188.689,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" ymax="-33.90007966676468953" ymin="-33.93242806047424409" xmax="18.41187375074135701"/>
+        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93242806047424409" ymax="-33.90007966676468953"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="179.156,191.505,mm" id="Trail Start" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="7" frame="true" positionOnPage="113.002,2.39423,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="113.002,2.39423,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Start" positionLock="true" zValue="7" isTemporal="0" followPreset="true" mapRotation="0" position="113.002,2.39423,mm" blendMode="0" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="113.002,2.39423,mm" followPresetName="Routes" type="65639" size="179.156,191.505,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" ymax="-33.92465573363980269" ymin="-33.95791657202656921" xmax="18.42354248737832023"/>
+        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95791657202656921" ymax="-33.92465573363980269"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="67.7828,166.874,mm" id="Left inset 21KM" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="6" frame="true" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Routes" position="5.86559,4.09761,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Left inset 21KM" positionLock="true" zValue="6" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
+        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="113.3,76.1023,mm" id="Bottom inset 21KM" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="5" frame="true" positionOnPage="133.191,119.125,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="133.191,119.125,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true">
-        <FrameColor blue="144" green="34" alpha="255" red="103"/>
-        <BackgroundColor blue="215" green="175" alpha="255" red="200"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Bottom inset 21KM" positionLock="true" zValue="5" isTemporal="0" followPreset="true" mapRotation="0" position="131.391,120.702,mm" blendMode="0" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="131.391,120.702,mm" followPresetName="Routes" type="65639" size="113.3,76.1023,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true">
+        <FrameColor red="103" alpha="255" green="34" blue="144"/>
+        <BackgroundColor red="200" alpha="128" green="175" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
+        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
         <LayerSet/>
         <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="68.3676,117.12,mm" id="End inset Trail" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="4" frame="true" positionOnPage="19.6693,7.89412,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="19.6693,7.89412,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Main Map" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="8.14144,4.02261,mm" blendMode="0" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="8.14144,4.02261,mm" followPresetName="Routes" type="65639" size="282.732,188.839,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
+                </Option>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
+                </Option>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
+        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymin="-33.92600000000000193" ymax="-33.8918539481981469"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
-      </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="63.655,88.3012,mm" id="Start inset Trail" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="3" frame="true" positionOnPage="170.062,49.6297,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="170.062,49.6297,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-              </Option>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
-      </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="75.8756,69.7635,mm" id="Contour inset Trail" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="2" frame="true" positionOnPage="200.321,125.314,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="200.321,125.314,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" uuid="{917a530c-14f4-4ed8-b109-961939435221}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-              </Option>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
-        <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" clipSource=""/>
-      </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="282.732,188.839,mm" id="Main Map" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.15,mm" mapRotation="0" isTemporal="0" zValue="1" frame="true" positionOnPage="8.14144,4.02261,mm" drawCanvasItems="true" mapFlags="0" itemRotation="0" followPresetName="Routes" position="8.14144,4.02261,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="round" blendMode="0" type="65639" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.378'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
-                </Option>
-              </Option>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.37199999999999989" ymax="-33.89185394818929353" ymin="-33.92600000000000193" xmax="18.42312398090293613"/>
-        <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28317,40 +28724,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview show="1" centered="0" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" blendMode="0" position="3" name="Overview 1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" show="1">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="alpha">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="alpha" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="103,34,144,26" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="103,34,144,26"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="103,34,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28358,9 +28765,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28370,113 +28777,113 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;" filterFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerName="all_routes" hideCoverage="0" sortKey="&quot;Sort&quot;"/>
+      <Atlas coverageLayerName="all_routes" filterFeatures="1" sortKey="&quot;Sort&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" enabled="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" coverageLayerProvider="ogr" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="120" units="mm" name="Marshal Plan A1" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Marshal Plan A1" printResolution="120" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="594,841,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="594,841,mm" itemRotation="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28484,15 +28891,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="4,4,mm" id="" title="" zValue="8" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionOnPage="25.5925,18.7971,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" position="25.5925,18.7971,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="8" resizeToContents="1" frame="false" blendMode="0" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" background="true" groupUuid="" frameJoinStyle="miter" position="25.5925,18.7971,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28503,242 +28910,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="16" multilineHeightUnit="MM" multilineHeight="6.6444479999999997" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="5.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="1" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbol" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -28748,17 +29155,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" checked="Qt::Checked" id="all_routes20170907054841602" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" checked="Qt::Checked" legend_exp="" id="all_routes20170907054841602">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="QString" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="QString" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28766,207 +29173,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="91.9494,15.0649,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="5.2963,808.939,mm" labelText="MARSHAL POSITIONS" itemRotation="0" position="5.2963,808.939,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.2963,808.939,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="5.2963,808.939,mm" type="65641" htmlState="0" size="91.9494,15.0649,mm" itemRotation="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.6212,15.3656,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="430.403,825.052,mm" labelText="REVISION 1.2" itemRotation="0" position="430.403,825.052,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="430.403,825.052,mm" blendMode="0" labelText="REVISION 1.2" referencePoint="0" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="430.403,825.052,mm" type="65641" htmlState="0" size="56.6212,15.3656,mm" itemRotation="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="114.848,15.0635,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="4" frame="false" marginX="1" positionOnPage="372.175,808.942,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="372.175,808.942,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="4" marginY="1" position="372.175,808.942,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="372.175,808.942,mm" type="65641" htmlState="0" size="114.848,15.0635,mm" itemRotation="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="100.498,63.9757,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="3" frame="false" positionOnPage="489.557,775.395,mm" itemRotation="0" position="489.557,775.395,mm" pictureWidth="63.5856" groupUuid="" pictureHeight="63.9757" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="63.9757" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="489.557,775.395,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="489.557,775.395,mm" pictureWidth="63.5856" type="65640" size="100.498,63.9757,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28974,199 +29381,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="481.428,0.606138,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="2" frame="false" shapeType="1" positionOnPage="5.4463,824.155,mm" itemRotation="0" position="5.4463,824.155,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.4463,824.155,mm" blendMode="0" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" type="65643" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" itemRotation="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="584.759,811.213,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="true" positionOnPage="3.94474,5.25965,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal plan" position="3.94474,5.25965,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="3.94474,5.25965,mm" blendMode="0" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.94474,5.25965,mm" followPresetName="Marshal plan" type="65639" size="584.759,811.213,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
+        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerName="complete_marshal_overview" hideCoverage="1" sortKey="page"/>
+      <Atlas coverageLayerName="complete_marshal_overview" filterFeatures="0" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Access Roads" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Access Roads" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="0" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="34.45,40.8,mm" id="" title="" zValue="15" positionOnPage="244.484,130.172,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" position="244.484,130.172,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="185" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="15" resizeToContents="1" frame="true" blendMode="0" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" background="true" groupUuid="" frameJoinStyle="miter" position="244.484,130.172,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="185" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29174,242 +29581,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="5.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="group" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29419,15 +29826,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
+          <layer-tree-group expanded="1" name="Residents Access" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" name="residents_access_roads" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29435,207 +29842,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="194.851,7.272,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="0" positionOnPage="9.37446,191.81,mm" labelText="ACCESS ROUTES FOR RESIDENTS" itemRotation="0" position="9.37446,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" referencePoint="0" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="14" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="57.4836,6.8714,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="6" frame="false" marginX="1" positionOnPage="204.225,191.81,mm" labelText="REVISION 1.1" itemRotation="0" position="204.225,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.1" referencePoint="0" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="51.6706,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="210.038,199.082,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="210.038,199.082,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="262.196,188.218,mm" itemRotation="0" position="262.196,188.218,mm" pictureWidth="17.3653" groupUuid="" pictureHeight="17.4718" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29643,100 +30050,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="251.959,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" position="9.59946,198.832,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="67.7828,166.874,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="2" frame="true" positionOnPage="5.86559,4.09761,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Access Routes" position="5.86559,4.09761,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Access Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29751,149 +30158,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29903,43 +30310,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="282.012,175.592,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.15,mm" mapRotation="0" isTemporal="0" zValue="1" frame="true" positionOnPage="9.44946,9.08557,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Access Routes" position="9.44946,9.08557,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="round" blendMode="0" type="65639" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,9.08557,mm" followPresetName="Access Routes" type="65639" size="282.012,175.592,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
+        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29954,149 +30361,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30106,316 +30513,316 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" enabled="1" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" hideCoverage="1"/>
+      <Atlas coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" units="mm" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" page="0" position="0"/>
+          <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="194.851,7.272,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="0" positionOnPage="9.37446,191.81,mm" labelText="Access to P9 Parking and VIP Tent" itemRotation="0" position="9.37446,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="Access to P9 Parking and VIP Tent" referencePoint="0" valign="64" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="14" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="57.4836,6.8714,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="6" frame="false" marginX="1" positionOnPage="204.225,191.81,mm" labelText="REVISION 1.0" itemRotation="0" position="204.225,191.81,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="64" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="51.6706,6.60801,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="5" frame="false" marginX="1" positionOnPage="210.038,199.082,mm" labelText="Sunday, 20 October 2019" itemRotation="0" position="210.038,199.082,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="29.7523,17.4718,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="262.196,188.218,mm" itemRotation="0" position="262.196,188.218,mm" pictureWidth="17.3653" groupUuid="" pictureHeight="17.4718" anchorPoint="4" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30423,85 +30830,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="251.959,0.1,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="9.59946,198.832,mm" itemRotation="0" position="9.59946,198.832,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{025604c1-b118-4f15-b140-54c9145260c4}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="false" size="282.012,182.649,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.15,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="9.44946,7.25098,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="" position="9.44946,7.25098,mm" labelMargin="0,mm" followPreset="false" groupUuid="" frameJoinStyle="round" blendMode="0" type="65639" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="false" mapRotation="0" position="9.44946,7.25098,mm" blendMode="0" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frame="false" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,7.25098,mm" followPresetName="" type="65639" size="282.012,182.649,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
+        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30516,149 +30923,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="0" annotationFormat="0" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="0" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="0" unit="0" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="0" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30668,106 +31075,106 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" enabled="0" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" hideCoverage="1"/>
+      <Atlas coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="120" units="mm" name="Marshal Plan" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Marshal Plan" printResolution="120" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,420,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,420,mm" itemRotation="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30775,15 +31182,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" positionLock="true" size="23.5967,8.3142,mm" id="" opacity="1" referencePoint="0" sectionWidth="23.5967" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="8.3142" outlineWidthM="0.3,mm" zValue="9" frame="false" positionOnPage="112.086,406.476,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" position="112.086,406.476,mm" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" id="" positionLock="true" zValue="9" position="112.086,406.476,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.2" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="23.5967" excludeFromExports="0" positionOnPage="112.086,406.476,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="23.5967,8.3142,mm" itemRotation="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30791,139 +31198,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="27.7839,7.51682,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="8" frame="false" marginX="0" positionOnPage="214.292,406.874,mm" labelText="REVISION 1.4" itemRotation="0" position="214.292,406.874,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="1" position="214.292,406.874,mm" blendMode="0" labelText="REVISION 1.4" referencePoint="0" valign="32" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="214.292,406.874,mm" type="65641" htmlState="0" size="27.7839,7.51682,mm" itemRotation="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="45.1194,8.13137,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="0" positionOnPage="5.69321,398.344,mm" labelText="MARSHAL POSITIONS" itemRotation="0" position="5.69321,398.344,mm" valign="64" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.69321,398.344,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="5.69321,398.344,mm" type="65641" htmlState="0" size="45.1194,8.13137,mm" itemRotation="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="22.2406,33.2917,mm" id="" title="" zValue="6" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionOnPage="15.6525,12.5708,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="1" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" frame="false" position="15.6525,12.5708,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="false" blendMode="0" positionOnPage="15.6525,12.5708,mm" size="22.2406,33.2917,mm" background="true" groupUuid="" frameJoinStyle="miter" position="15.6525,12.5708,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30934,242 +31341,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="16" multilineHeightUnit="MM" multilineHeight="6.6444479999999997" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style textOpacity="1" fontSize="14" multilineHeightUnit="MM" multilineHeight="5.9388920000000001" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="group" indent="0">
+            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="1" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbol" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -31179,19 +31586,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option type="Map">
-                <Option value="group" type="QString" name="legend/title-style"/>
+                <Option name="legend/title-style" type="QString" value="group"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31199,15 +31606,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="118.192,7.80192,mm" id="" opacity="1" referencePoint="0" sectionWidth="118.192" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="7.80192" outlineWidthM="0.3,mm" zValue="5" frame="false" positionOnPage="5.69321,406.988,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" position="5.69321,406.988,mm" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" id="" positionLock="true" zValue="5" position="5.69321,406.988,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.2" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="118.192" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="118.192,7.80192,mm" itemRotation="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31215,15 +31622,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="93.5757,8.13167,mm" id="" opacity="1" referencePoint="0" sectionWidth="93.5757" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="8.13167" outlineWidthM="0.3,mm" zValue="4" frame="false" positionOnPage="148.501,398.344,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" position="148.501,398.344,mm" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" id="" positionLock="true" zValue="4" position="148.501,398.344,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.2" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="93.5757" excludeFromExports="0" positionOnPage="148.501,398.344,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="93.5757,8.13167,mm" itemRotation="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31231,21 +31638,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="49.3143,31.2967,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../../Gun Run 2023.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="3" frame="false" positionOnPage="243.319,382.696,mm" itemRotation="0" position="243.319,382.696,mm" pictureWidth="49.3143" groupUuid="" pictureHeight="27.9119" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="27.9119" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="243.319,382.696,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.319,382.696,mm" pictureWidth="49.3143" type="65640" size="49.3143,31.2967,mm" file="../../Gun Run 2023.png" itemRotation="0" resizeMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31253,101 +31660,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="236.083,0.14328,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="2" frame="false" shapeType="1" positionOnPage="5.84321,406.626,mm" itemRotation="0" position="5.84321,406.626,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.84321,406.626,mm" blendMode="0" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" type="65643" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" itemRotation="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="286.94,392.396,mm" id="" opacity="1" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="5.03,5.9483,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Marshal plan" position="5.03,5.9483,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="5.03,5.9483,mm" blendMode="0" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.03,5.9483,mm" followPresetName="Marshal plan" type="65639" size="286.94,392.396,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36924763341120581" ymax="-33.92487327745350001" ymin="-33.94797288016832937" xmax="18.38613924055453452"/>
+        <Extent xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016833647" ymax="-33.92487327745350711"/>
         <LayerSet/>
         <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutMultiFrame html="Page [% &quot;page&quot; %] " maxBreakDistance="10" evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" url="" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" url="" resizeMode="0" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" contentMode="1" html="Page [% &quot;page&quot; %] " maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
         <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31355,14 +31762,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" url="" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" url="" resizeMode="0" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
         <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31370,14 +31777,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" url="" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" url="" resizeMode="0" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31387,99 +31794,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" enabled="1" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerName="marshal_overviews" hideCoverage="1" sortKey="page"/>
+      <Atlas coverageLayerName="marshal_overviews" filterFeatures="0" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" name="Fencing - Cones only" worldFileMap="">
-      <Snapper tolerance="5" snapToItems="1" snapToGuides="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" offsetX="0" resUnits="mm" resolution="10" offsetY="0"/>
+    <Layout worldFileMap="" name="Fencing" printResolution="300" units="mm">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" positionLock="false" size="297,210,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" zValue="0" frame="false" positionOnPage="0,0,mm" itemRotation="0" position="0,0,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65638" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true">
-          <FrameColor blue="0" green="0" alpha="255" red="0"/>
-          <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31487,15 +31894,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem groupUuid="" legendFilterByAtlas="0" type="65642" itemRotation="0" wmsLegendWidth="50" equalColumnWidth="1" symbolHeight="4" boxSpace="2" symbolWidth="7" titleAlignment="1" rasterBorderColor="0,0,0,255" size="38.1563,53.7608,mm" id="" title="" zValue="11" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" positionOnPage="256.808,5.21277,mm" blendMode="0" referencePoint="0" frameJoinStyle="miter" minSymbolSize="0" positionLock="true" outlineWidthM="0.3,mm" maxSymbolSize="0" columnSpace="2" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" background="true" rasterBorder="1" symbolAlignment="1" rasterBorderWidth="0" excludeFromExports="0" opacity="1" splitLayer="0" resizeToContents="0" wrapChar="" visibility="1" wmsLegendHeight="25" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" frame="true" position="256.808,5.21277,mm" columnCount="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem symbolWidth="7" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,68.0108,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" wmsLegendWidth="50" symbolAlignment="1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31506,242 +31913,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" name="title" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="12" multilineHeightUnit="MM" multilineHeight="5.2333359999999995" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="group" indent="0">
+            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="75" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="3" name="subgroup" indent="0">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <text-style textOpacity="1" fontSize="9" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
+            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="symbolLabel" alignment="1" marginTop="2" marginLeft="2">
-            <text-style textOpacity="1" fontSize="10" multilineHeightUnit="MM" multilineHeight="4.5277799999999999" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
+            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
               <families/>
-              <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-              <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-                <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                      <Option value="255,255,255,255" type="QString" name="color"/>
-                      <Option value="bevel" type="QString" name="joinstyle"/>
-                      <Option value="0,0" type="QString" name="offset"/>
-                      <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                      <Option value="MM" type="QString" name="offset_unit"/>
-                      <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                      <Option value="no" type="QString" name="outline_style"/>
-                      <Option value="0" type="QString" name="outline_width"/>
-                      <Option value="MM" type="QString" name="outline_width_unit"/>
-                      <Option value="solid" type="QString" name="style"/>
+                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                      <Option name="color" type="QString" value="255,255,255,255"/>
+                      <Option name="joinstyle" type="QString" value="bevel"/>
+                      <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                      <Option name="outline_style" type="QString" value="no"/>
+                      <Option name="outline_width" type="QString" value="0"/>
+                      <Option name="outline_width_unit" type="QString" value="MM"/>
+                      <Option name="style" type="QString" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -31751,33 +32158,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./fencing.shp|layername=fencing" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" name="fencing" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" name="all_routes" legend_exp="">
+            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -31785,77 +32192,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="148.46,6.45211,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="10" frame="false" marginX="0" positionOnPage="6.76779,191.188,mm" labelText="CONES: [% &quot;name&quot; %]" itemRotation="0" position="6.76779,191.188,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="63" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="56.3557,6.45237,mm" id="" opacity="1" referencePoint="0" sectionWidth="56.3557" hideBackgroundIfEmpty="0" excludeFromExports="0" sectionX="0" sectionHeight="5.76" outlineWidthM="0.3,mm" zValue="9" frame="false" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" itemRotation="0" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" position="182.723,191.188,mm" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" groupUuid="" frameJoinStyle="miter" sectionY="0" blendMode="0" type="65647" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31863,269 +32270,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="26.8205,6.82826,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="8" frame="false" marginX="0" positionOnPage="209.146,198.083,mm" labelText="REVISION 3.0" itemRotation="0" position="209.146,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" background="false" halign="2">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="0" positionLock="true" size="51.1638,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="1" zValue="7" frame="false" marginX="1" positionOnPage="62.6706,198.083,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" position="62.6706,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="62.6706,198.083,mm" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="62.6706,198.083,mm" type="65641" htmlState="0" size="51.1638,7.07327,mm" itemRotation="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="64.7594,7.10512,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="6" frame="false" marginX="0" positionOnPage="116.805,198.083,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" position="116.805,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="90.2083,7.07327,mm" itemRotation="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="90.2083,7.07327,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" marginY="0" zValue="5" frame="false" marginX="0" positionOnPage="6.76779,198.083,mm" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" position="6.76779,198.083,mm" valign="32" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65641" htmlState="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" background="false" halign="1">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
-          <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
-                  <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
-                <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
-                    <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" pictureRotation="0" size="49.3143,29.8354,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" mapUuid="" outlineWidthM="0.3,mm" file="../GunRun2022_250.png" resizeMode="0" svgBorderWidth="0.2" mode="1" zValue="4" frame="false" positionOnPage="243.098,175.353,mm" itemRotation="0" position="243.098,175.353,mm" pictureWidth="29.6535" groupUuid="" pictureHeight="29.8354" anchorPoint="8" northMode="0" frameJoinStyle="miter" northOffset="0" svgFillColor="255,255,255,255" blendMode="0" svgBorderColor="0,0,0,255" type="65640" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32133,380 +32478,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="232.01,0.14328,mm" id="" opacity="1" referencePoint="0" excludeFromExports="0" cornerRadiusMeasure="0,mm" outlineWidthM="0.3,mm" zValue="3" frame="false" shapeType="1" positionOnPage="6.91779,197.79,mm" itemRotation="0" position="6.91779,197.79,mm" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65643" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
+          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem groupUuid="" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" type="65646" itemRotation="0" height="2" unitLabel="m" numSegments="2" alignment="0" size="88.3204,15.8378,mm" id="" unitType="meters" zValue="2" subdivisionsHeight="1.5" labelBarSpace="1" positionOnPage="6.76779,2.8482,mm" labelHorizontalPlacement="0" blendMode="0" referencePoint="0" segmentMillimeters="26.1864" numUnitsPerSegment="30" frameJoinStyle="miter" style="Double Box" labelVerticalPlacement="0" positionLock="true" segmentSizeMode="1" outlineWidthM="0.3,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" background="false" lineJoinStyle="round" boxContentSpace="0.2" numSubdivisions="1" excludeFromExports="0" opacity="1" maxBarWidth="100" numSegmentsLeft="2" visibility="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" minBarWidth="25" outlineWidth="0.2" frame="false" lineCapStyle="square" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="20" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" labelHorizontalPlacement="0" segmentMillimeters="25.8173" style="Double Box" referencePoint="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="87.2133,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textOpacity="1" fontSize="12" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
           <families/>
-          <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="0" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-          <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" alpha="255" red="0"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="invalid" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option type="invalid" name="thousand_separator"/>
+            <Option name="decimal_separator" type="invalid"/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" alpha="255" red="0"/>
-        <fillColor2 blue="255" green="255" alpha="255" red="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{ba8b697f-af10-49bc-b789-55678d099479}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <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="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="" is_animated="0">
+          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
+            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" positionLock="true" size="283.418,180.92,mm" id="" opacity="0.9" keepLayerSet="false" referencePoint="0" excludeFromExports="0" outlineWidthM="0.3,mm" mapRotation="0" isTemporal="0" zValue="1" frame="false" positionOnPage="6.76779,9.35102,mm" drawCanvasItems="false" mapFlags="0" itemRotation="0" followPresetName="Cones" position="6.76779,9.35102,mm" labelMargin="0,mm" followPreset="true" groupUuid="" frameJoinStyle="miter" blendMode="0" type="65639" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" background="false">
-        <FrameColor blue="0" green="0" alpha="255" red="0"/>
-        <BackgroundColor blue="255" green="255" alpha="255" red="255"/>
+      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" background="false">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.38081056635935795" ymax="-33.91866254684331494" ymin="-33.92052446432401069" xmax="18.3837273348683965"/>
+        <Extent xmax="18.37821516684363488" xmin="18.37624285840067628" ymin="-33.94258732662760991" ymax="-33.94132830492694808"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32521,92 +32866,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenColor="0,0,0,255" minimumIntervalWidth="50" annotationExpression="" intervalX="5" annotationFormat="4" topAnnotationPosition="1" bottomAnnotationPosition="1" frameAnnotationDistance="1" gridFrameStyle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" leftFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" leftAnnotationPosition="1" bottomAnnotationDisplay="3" crossLength="3" offsetY="0" rotatedTicksMinimumAngle="0" blendMode="0" rotatedAnnotationsEnabled="0" gridFrameMargin="0" bottomAnnotationDirection="0" rightAnnotationDisplay="3" unit="1" name="Grid 1" showAnnotation="0" rightAnnotationPosition="1" intervalY="5" rotatedTicksLengthMode="0" topAnnotationDirection="0" gridFramePenThickness="0.5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" show="0" offsetX="0" maximumIntervalWidth="100" rotatedAnnotationsLengthMode="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" gridStyle="0" topFrameDivisions="0" leftAnnotationDirection="0" rotatedTicksEnabled="0" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" position="3" gridFrameSideFlags="15" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
           <lineStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="line" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <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="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="marker" name="" is_animated="0">
+            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
+              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -32623,58 +32968,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textOpacity="1" fontSize="10" multilineHeightUnit="Percentage" multilineHeight="1" fontWeight="50" fontSizeUnit="Point" fontLetterSpacing="0" capitalization="0" fontUnderline="0" namedStyle="" forcedItalic="0" fontWordSpacing="0" fontKerning="1" fontFamily="Myriad Pro" fontItalic="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" forcedBold="0" textOrientation="horizontal" blendMode="0" textColor="0,0,0,255">
+          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
             <families/>
-            <text-buffer bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskSize="1.5" maskType="0" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers=""/>
-            <background shapeSizeUnit="MM" shapeRotation="0" shapeBlendMode="0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeDraw="0" shapeType="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOffsetX="0" shapeSizeType="0" shapeSizeX="0">
-              <symbol clip_to_extent="1" force_rhr="0" frame_rate="10" alpha="1" type="fill" name="fillSymbol" is_animated="0">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
+            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
+              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0" id="">
+                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,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="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowBlendMode="6" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32684,19 +33029,19 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" maxBreakDistance="10" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" url="" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" stylesheetEnabled="true" useSmartBreaks="true" contentMode="1" type="65648" resizeMode="0">
+      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" url="" resizeMode="0" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32706,30 +33051,30 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" enabled="1" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerName="cone_only_groups" hideCoverage="1" sortKey="&quot;group&quot;"/>
+      <Atlas coverageLayerName="fence_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
@@ -32737,7 +33082,7 @@ def my_form_open(dialog, layer, feature):
   <Sensors/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.38073251581242573" ymax="-33.91261403108947547" ymin="-33.92010227189385319" xmax="18.39453367306187204">
+    <DefaultViewExtent xmax="18.43564544749748535" xmin="18.38044081847287714" ymin="-33.91875794015667367" ymax="-33.88880497692461091">
       <spatialrefsys nativeFormat="Wkt">
         <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
         <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
@@ -32751,41 +33096,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" frameRate="1" timeStep="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings frameRate="1" timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="invalid" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="direction_format"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option type="invalid" name="thousand_separator"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
-        <Option type="invalid" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
-        <Option value="false" type="bool" name="show_leading_zeros"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="false" type="bool" name="show_suffix"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option type="invalid" name="thousand_separator"/>
+        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
+        <Option name="decimal_separator" type="invalid"/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
+        <Option name="show_leading_zeros" type="bool" value="false"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_suffix" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
     <CoordinateCustomCrs>
@@ -32802,7 +33147,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" destinationFollowsActiveLayer="1" destinationLayerName="marshal_positions" autoAddTrackVertices="0" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" destinationLayerProvider="ogr" autoCommitFeatures="0">
+  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" destinationFollowsActiveLayer="1" autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayerProvider="memory" destinationLayer="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" destinationLayerName="route_markers">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index 7c55276d822e110707061b768f3f9fd49c96bddf..bd567473af42bbed8fe512ad9333340e31813f38 100644
GIT binary patch
delta 551
zcmbQTmT}2i#tG7lK@(;C?G7+AFfgplT627Mf{{b=xs-DW-y9CC@$(OB&oFW@xWyZ(
z_}SqABT&s(AO-=LoNuW0oSuy<C-chwX!8*Kn`-3n{pXHSmM;zmE{lZk1o8DGo^N29
z9LaZCr~Su<C+%rQ4xdu5^p*n6yB4CdQas(rp?*HM?m-~`(-p25DImXTXY;<v7W^)<
zreRN-w*dtv@$LM&8K_`mz2?cSK)&46nb%iMp2=^;s4@8pzXl`I=D+;nO!bm!^K7}Z
zj2xoW6_%X^Dxc|CeU25#&wY}5`T~%@d!AVK-%KM1t+hWUTn6$DR(yW?0LU*nu(J0y
zkbjL?s{Is@KfA`D=K+vE!>NDQP9XnM%!Z!FK)&ak2RAnY`PVtsn4SXpJy(^cEdcT#
z^*`)*@!28n0AG9XhHj9CBV2axfC^S?XU#7I^6Pfq{rd&T|G#*5R6LMB=b?DOe;{8w
z+UZdwkUuT@nh66i$d)cv><<CSzq>2};>VW#VDJX=L$5Ko{oBkad|8YqM5SiEY!cAU
z`HkY6A85W%Vfph@o_F#YKM7qBqZ1filihBK^Z-qlvQTtt1@af(n3vWG<U896)U^Ql
wVSG)xZJP!CH?zp@dz&e=2pC5iPwRgO11+roYPe(@kS|&&Q^UXcVen=q01grR$^ZZW

delta 535
zcmZ3omT}5j#tG7lUK3^f?KUtoFfgplT627Mf{{b=xs-DW-y9BHIaXBCnPKE$aEmum
z@w3ALMxdI{KnwyfxvsL@sl6LlPUe*jw43wqPpXl_arclT%wHT1=$u)#>@Sf2FSY4E
z<K#%b%RD=k?}SOF8#%=I+*mw0g5O29Xr1<!bwGistF@&!0xhu3JShj_dp>(~Y3<~l
z{8o$xlfUq5FfwnJ6%c2tcX`ah#GPg2P+Rl=!#SYxx8DzZWC!wZKR6M50m%2PR@uV>
z<hNgYb^9WaU$@#|+TTnghgZ)vw_E}8<<$RYJOJ{)DOH=_0rK71Q&>&``K;_;w><>%
z(-#>R>;UrT#ZFUs3gjRAxJ-N#kT10`_&1QBcVO$6&g6wafzL@n$6f*zm@nH^+XLi3
zo?c!39>`xd@6+pYAV24ipvyNPf9<EYa}$94EQ>jj48S0%bzOZZ63F+{WVK-g^4q!`
zK7|1Jj5F4Vf%vb3EZ_J5`Adu+Z~nhoQ24SK&%8%c-zAfb9NNMbDQ^Ct`9g(dt__dY
z<U4*6x*!H9dfq1%yy^zp_GV^@P8*Q_H^Drj6UaYY#T(xW<mZJS<>}b0=)ajowqh2~
i-?_jzseJOKPYh_`-G%I$Yk_>n8%sV3ZT=X%nF#>;^!UjD

diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index bf8bcc4a072347b2dcd52a79c6d5f46f0d2f5483..0a66c8ad0b20d4e44f932f3198303f5226e4921c 100644
GIT binary patch
delta 32
ncmZo+Y+;;`EqQ=}f&Ci;gMbDDgM<<T1HT0WgL)hT1M>#}a)kyB

delta 32
ncmZo+Y+;;`ExCb#f&Cc+gMa}8gM<_V1HT0WgL)VP1M>#}Z=D6@

diff --git a/GIS Base Map/fencing.dbf b/GIS Base Map/fencing.dbf
index 586c493e97d9ae09af56a211fbe6fc42bd51a2be..feb359039bd302ae45cf4e696f4b0b9750610b8b 100644
GIT binary patch
literal 45426
zcmeI5O>g5i5QeiYilPhj5A?)did_Q*B<=R&+8D?lnl941J@lxxDO*@sG-NqJw*Boz
zDaj&fif*cp@nQMu5K(l@1dm@2$r*C^>0e)b{`b|@)z{CmXY$s$(v_-uTa})x$EL6@
z#9`MI>(@WCUSEpsmgi+vJFkBHQ~fZmt+?m$yNt`K`u+AlQ9kaf*Q%?2zy0^~czg2t
zUGux@=O$gPcwRp`+h4_x?eEsFf6_i3?_aW+x>yvv3Ygc|Y$<ZSuMxZ{;(W~ub{#*m
zYjMc<eO#>Ai^U<AOkeh=G-J^T>nH;2mi0A{mmBsCn`d#s^Zf|Q&F2EvmOf_*&zHQe
zBxW5(uYK2bm-XUMBvRCIc_@Y%kK@NVW1(q7z}lf}BGys#19aWmkX!K}d&ZwLArkhR
zh*xYE7w^-2%`#CAG2R_}?Y#}r<B)m0-}9`&Tnct4L^i5}1Z%r*yddizeYYV7>w2Ue
zXF{5djy)ML%<ky=JFsrY*9$qm&e9~|jTsq0_w+jh)~7t!Y`=?_vP+cL)T~2$-sruq
zFUb0P*pSwSv~zPg2ARTKGs}jAuLIv%>v`i%ny34XWn)G>+Ve)R2I~=W>i1S-jt*V-
zL)ZJa!MZoH!EXpJXG22F8&zDU^<Ovl@lI8%Z;V3kV_<rGeVeW~<whL#e27=C`^~b(
zd{N;2_*&bLKk^kXcGB554QhLQ9fj~;s~Fhtn}T!pQ@-4YNdmkMUEkDyEK76FwugPm
z5|L%%;rTAjWQ?<kFn7NnA5D!h4x!dHY{=zoNZ`HiN&BzwL{X}!%tCB=vFFE%LH<?S
zhQMBH*5vjYx>n<BYF)#IXkAmY4!zg4?i+uJ)BG6z`co9|mFd2#hG^9yhL`;Y-W_`l
z)@pnW*2E)uW1T8kgEcXM%QbJz8=-4r?64ukfQ{y%YXb&x5xOP@Y%~vD8!(8A&^0k&
zqj~7sfI(b@u89E~%|q7)4C3M?b?to|UHepxdE-2LTpgFZ%T=rAg9!iW`Rn-kyl3t7
zse(0yIdR(%um)=i0+(ykJr04cDLw(%5DKd9Hlb@b7m8Zwnu4mkP3YRqg`yU^rl9I>
z6S{VDp{RwfDX6;Jgs$COC~Bc=3aailp=&o6idyKJf~vbs=-SPNqV{sSMotSu*Tj4O
zk-OH=HFfS<<O$aCMrzjB!=YIlv0d!pAn6;Ov0WP0h@-pq%OD1JIbBn*4zX`n+v_Gr
zOPwLO6b~|g{+^wr6zQ7~+sf4v1|f3BwK<s=Wh^(OkI#qGe*M6@C2_nPa~ZI<*i8Kh
z)>9Kb-yT?>XEXIHU_CX_^X*-Zb%dN2dfrH#(*mr)`uvxE;#UkCLagf$IX<<niF15{
zwV`Wr*52oJ*Zz<<GVNq8kMK$JlHJK8lg3Wh?K%1@@BJZ~b#pq^TRs}{u}cAKt8X>p
zjnu3|=vw9Hvr|p>^`TmyqRbO~dZr*)Ya2q&8ad-s3~W?jz!tT9u5_)gK%Q;vyA28S
z_`3C94?W9RaXl6!UR?#&jDfY*19b_ksR`@$!CJGRE`c>QVckAhYZlZcu%;%g+XrjS
zg1Q9O)P!~Wmt^hxd0+<Xsn@!9=8a&j{2|1wL%BIgf1i9T1=`PNtW$kq_@QLdxSJv^
zKd^<!bDqEB#kxur_q4|~uzXLE@4hGFtjxRkKFv~*vl}5+Y%UJ<s@371D9eU~QRKO<
zpJe^Ce$SbMO4l=Wu@HNcv`^Kr8~?{doI|YYE&nxi9W>{XR>a*lWVo)wQ+o~8#H^JG
zk;zpf@6RRGy1o?;ykJc<z1}smlZ!;se9baZZSCmYNrtnTvL{S-l-{#8bUit13E0pz
z_9o4=uG@Iya0{(vT$MWZ+V?oRF_)RkBcyqzkGB&dtB#Z&jNY2dgc0WGYL4Enot(=v
zoq0a~<nC%NW7?1id!!ZXUk`Ha<i64MJS~<PXL5dSs=c4c?R8IJt^FZjecInl{$#A3
zBxmjY_*(0F!Q*9?CP{5N9N_y|kj@%2jQNaM!PH|udmMuGeA@R!%{uZvR-orH?U-+I
zD3USb>b6hm%w@oO7cY5HshfheF}{wxpUXJ*fgN?-+t<|UxxH8CCaJ6PJ$XNGJZnQn
zvkt*pNv$pzem={FOwZc)*sj6a9hVu7ywdfFy$*sKQLt^C$7{ajau=mYm>k}hMf`1&
zi3cVNNs=y4#qbe58S}<Q*L9R&KxClH#5(6LjKEs$xjSJ!*psT6+rB64{crllico8>
an|t3Gxn|s!z`7-IydUE-)e`~hul@xz?aA8!

literal 45665
zcmeI5%Wva05XQ4@FI}KO&pol1Aoa;|-^a#)_plEbb$jShv1wa~Od7JBAOZTX7pq4k
zK1>C+q!9}6)4?_=iM#me%WybDQeQrQ{q4V3S6AP^xqp*=ogC4suKJY!dRrIEADcuT
z_vO#x{8!fbrQGefNb}lh{_$V_p&dK<z{9(kXH~`h_J1OM+UMu;qqyJx_eHof&d<wh
z>(6bpT5(Yno$ar}r|R0`{1;W}<@*~ps*hki88fes(VB}TFA&`FaJglF%5cT5*({0D
zXSR?+aB;_zO$$gPHZf5D<U8u66#P(te3yh`!xMHJKCxSQjQK;DbfIpe{>69HO4Wah
z6;Jlzp#<MT#?~zs>dDx1)PX`h4<Dj9l7h{oT(PM<CaDGQvZ9ST@ErAtt-fZ{I83<c
zu5F+;rKzd9>=uFA1k_(?Kvl!pvz)zawm2s1KAxp*K!AEM)W4!ztcEZj<YVSlzmKI{
zmjju7nA}HV!(!RW6|qzu{07t&>Z)5Tzq^|dpf(wf)M$|!_3yr`+D2W(K+MO{vSg`x
zf*4301DR%HavqmvI+biLW!z~T1JtHQH3LG8+WT%%8IWnA?=Y5`({bXBm=EZzlBH^R
zAPP0Q#j_OD`XbGMl&I;t#h>AURH=bQmW7F<^_rJGW9z3^-Dnw*iT9`v`*4{J60@Uk
z)Pb4s0_x#Vd!O)9-C~sz$b9NP91vz1kg@m9o=SMlA`u<7m8I?e4b&z>Ej0ktCYruW
zK;1Xd#`b`^5l!DGv@|ZU0hxH8@G70XymPDu=6&TBZND0*iy_PqsC}Q^G*YVWdv=qh
zYDD(b5T-I9<#+c^!S<`Y&zLLJ?-I^MmVAjs%H~<Jyen)Ab%2Cdo$%6vsHuF+Cj1`Q
zhiJ1+xAJ%>XJB6j-$wnT??F@*ZtBF<@f0l7-cR}+uv_##Uaf5P$1oCQR^a9znVIS$
zACsrfBT;4xesD<ll`2csWAB5gDzZnsY9R3515v2|+GZ{Y`$H_Z(q0hrigue%S*iwV
zWk85gX9i?e%zBM;gS0yyQnr?HEFa(Qqc~fr&}n*4^8^3?oY5kC#0CVmS{V>()bK#+
zA<SH6OS&qzV<C4uIq;W?R)2-C)h0G=$_=%xhN_2B^%$s!LLGRIT6K%WqeY+wYP0jA
zD{0*#R85CDZyBg*`D(3eqeZA%<3jKgswRNyZW5|?b0MgOstKUFn}n*}TnK8RY67V4
zCZTFK7lK--ngFW1NvPV*g`jpoReL`<L8WoE(c(0ITD`0k%_f30=L}w*8DeK)yhrVf
z>;d&)1_Y>qnt;GyO}af0sG8sbxIGY{ra+Buk$|eRNvPV1g`yI+nu4mcO{m(5g`yIw
zrl9I<6RLJ%p{RtaDX2QzgsPobC@P_93aZXFp=u`<ib|-Of~vF4;Z%*y-&72QctfGF
z_sjWJ!pr@-H0R&KS(R483#bP}ja35*wU)-ESk4dB%2pGjh5=EkCbrc9CMVP{meN#>
zgx6Ue|78~qH-y1!h?T9@w#g!S4YBvTM*{U_W}yAmngM~T+haWEPAvuk)aL+ee+^K#
zXLsS9!=c7Toz8BNWTQ^(iCXUmqS<N^)ZROLYGAIRzR~ta&6W+!k|=#<3n>H_cRbm=
zx>%sLV0I8S@O}GPWk42bnC+9*-vQJnOU<taY7<T0C7|w`Xk&Xo-H4{|6F}WJ(Z=?G
zx)Dv^Ck8}~efH`s4Dp_**gaDD)j-|1$uQf~3<xpm0JEFw7>G6)Hy=mKk~vzOU>=Aa
z1G#2pEaYYprpIIzKAjiva6FC?3)rYWfchj}4b%?R^il=Xy<j}2k>OB}y?-x^vehSV
zrt4^~ZCi~jOznYasR2h8=5p>pZJHI$uLf!pP2Z&xTmAC3l9Tr>c2_lqFtq{EhA@|N
zbx6QAAV57BYVRX^$^$8FHPsL%z#E^NP&+Kbg;iz@B!FM7P@nkK7oxQ<w^3srNSzv>
zot!YiS{SA3_py{~_KDxKUK|i+dm!E~I~oo(Vj#7%r>*en9IMXlwykQQ9td@SgqJcP
T+Gx>sCR&v(4+N-5QGfRt_w+tF

diff --git a/GIS Base Map/fencing.shp b/GIS Base Map/fencing.shp
index 0c78f9313538bf3e990dccba71f29c6b7bfa59fa..769c5c72d0baf58930363c350cbd62ccd13aba0c 100644
GIT binary patch
delta 7314
zcmai(3s??$-^cIid>~1s6GbPTq#imD-O>puT6I?vDxFYHorH;4IjtC5;pr$FN!dcm
zp`21Svgo8`kyL0mCB?S9-~YXh=Qh{-zE9URbIs@f`~JTFduF~fbKlebB&u^8m7+;)
zJgB83xuxM>QIihNHm7})vK7Azx8z6mO1enA=U2HbF6!_DuNl|yMI21=cswyI<d0k9
z_Ci9Wlf<zay|R4m^FT|!j9*`MWIw-ZN`QXM3$UVZ#njc{VP6{3|A^TlD`uM^A)Yp5
z)wkWaAQnav%695M!N_Tz(vsca4<&Qmvxbc&pd)|Wn%P^YkBQLsj-2x>2U_=tiABF{
z!oahY2mFs?fNKs92_{8c5H5+WDP;N|{65<$p+j@qsczEIoASv+ADr)PqMAEAJ<*Xr
zw&v}&Ad_fEPnLBaFVf3;vAt-KVirooQqrYWvZ2&S84R$;UbZw*K3|5CV`S6>lsvN>
z>k-UFHG%3#h=fNxPmuC_8{DmnD_@Od^wrIkzZv<!uYyv62~%&PMlpPiU6dkIqmf39
zW|nL2qLi3UO#wBAsk0SO%FOcd0!oF^(pHlYOOod^HrhVQWMdj~!PEG6lM!+OFI6T_
zdw?E`E#Zmrs(gN28;a4@%@vcNsFsp#v;$AJc1=|qP7-@!SS?%Qb@jRHLF>A=Sxp<-
zp$InvQ*c(s!X!NrFV-7#s{J$Xd>(JkUwR={5Wl9wg4`jlAM@k-<KU?Wa#W2u6SG>j
z7ApBs7<awYBhJ&9D-#STb>`)Sw8<K9=acg&YqZ}xYo#UMpKoSk2QwR88;L6L?4N>a
zHHOV4nNt&8lvyQPL9-^KtQ$&cF`Ka-$Gp^yrN%S<dS#S0qpUAjp#uebdMAi%PZZhK
z71`Dk+13}?HW1l16xp7{)aeT-BSz0aFw$6L+=NLs5KyMfGpx-R8$$s#nMuLgoaw}R
z3d5fype&eltSy-ytpCNh8VRVWOg7fjm_e+qn1#jy%9=T8EMO}2RTyOx4{ACSY$8yf
zAu^Ah$o5R;kx48yi*YmEMcJ1=GIgOSKBF~RK+R@0V(q{zHWyHHm_l;_?TEHSa_B!b
znaRD!p?+}AW$TANe$_Octse72EcxryH<+yllUoQ$KlwYIToL$5MC;VUd(sd7J$-4-
zpU|>iX>Y%y-+(Q~rDPHB%Xbu3bb@;gW!nA*YmTA!G&f?PI9A1543lY=nbzJT4f`dZ
zD1)^hpNlF2tKMpHod{;+n1Ul<fuZ3+NAQ!|FK)$v6Vn3PT!~(+<t_QJedly~=Yo~$
zC-{r<-%fSDgum__J-m0=DJLw#OZ#)t(w8Y=mi#d{0_DhLp_N|mv%oo*v)>;8i{7MJ
zEn8!?Y%e^WS>K`6x~2QzbHU5l=O}z?Yd*Em$1t$y+HBW@9Aj3@)`*yB*=Cr!u*M_#
zcVF*B&EULKeF}VbXhuEX3wG?BXSAQ=%W8*f^j9(43{zLuc>cT`g$x+2$e<MRVD$Qp
zl6N6k!zEMx7{{2^vNcxA_QG>6>)W0mB6|itaaZW?lFz^>WViN$%NWqH%h*pQ5<SGM
zn60texGVqk!gL;M?7X9{^(=hK6>Jw5!e_;&$QPC1!tyBl;~Zb1R$HXVirHqE&SxC0
zLMb<<&?=2uz&Kh9Xm^YXua`5kwrnXvhNrv}Ggrc`DbK#S{4a1sWT5oW@Ko&e(w0PB
z`6yE3@*I8RL!>uYw(4g}#LHJgK9_tgNDEj$VF2~jO?1NV<a<NoEE%6(3>3vhBuj$V
z8OptQ1%7|K$V3|axZeE5GjK@z+UYXj+2_wKZUtx59CDTg4>elIRD+|}c`7M@70-AM
zTmpBmGUF?Pb3%28&V#2#ByS`9b!X|}y~R=Rz#@DU84PK(k-LFaSI+_|h!@pPx%dTq
zQTkmMxs#BS$v%o$En9QX9a>861U=GMJ;+gGd-vQh(IPvhoAhJKkcc<=2D1>0@Y_M5
z{m#t&xXL{jkH`~)Sj$g4?`9~z^#rdu7(YBQ`|W_$vb6`TncnKqRvm1!z5y-U%X(ps
zMOcJSr7WijPCEDyx6;&^rdb;)PsYvuHuW8&%#WoOGyC|Vv=^kpd&h*FR(cgalE?I)
zwuZrWNl|doI&e#WvC7KfkM#8^G^}N7td{MCr#I_+%Ev=$3$p6Un=W1tpCkD_Zacsq
zM@<x~>!ZKDV!kc%tGLZD6|ly4&7C~MVWb*gY}o|kx2qeLC4jrjf6E{fiC&4^+Sgus
zxEZECtnuEeqX{cv^a~YpumMKf=(dBg;JK!J337`UHRjg1z3}v9eGA4O*NBJD=gVoa
zci~g|%kcm@5d%9$>&M*T7?YxCjoS=UKh{{h*jQ!}G5%A2{uB7TQCgcF1U5-{H<CP~
zL_aX6Mptp0VY&p1Fs6D>1_bsn%6^nw{R&3cjl9%7z(0Cu$vho4W@E~&{YrJ3&V!cj
z{<Q2Fv|KOD;m_mI|4igqFw)Es;!n{(A0v<1`1rtm-+^b8@C$$EOvJ7I?ESKJ0klQs
zO}Q_i<$7VFrC5X^|I_NJix;#DCqHf{JJ3vjuhSoj0q54|r6fe6hpL%V<2J)IfHfAo
zeJsx$KA-)9&-B1&e^whk3#_t1`}+=#uV{@XMQ$@pm$AkpW_;0^3ZwZ_(}H`U-8AO#
zBM0!5hoelpIL6!>w-=tvu?X)Bnq^xR#zk1t{PP7#Yf1Qyo~gD?j<Dpb-7r3$KWt2X
z&5%ECP4<U?qyT7hKKRc*5A8>tU*jf$?|1v8R)dGlzj|{SmMgHNh~xb8E{9033&7WK
zv-XPzc(@nZZ@H;21GBB-%<B8YA7m8y6!_!TzF*;9BM$ACPH}?=(6-jKRlI>${80Ux
z7VskXhUIPG{F=hEtzh15_5K#Hzv&xEa{iyv4`MFXV<14SLYJhpIX%_C1YB-x`9nLn
zZOOxPC&2bwE0swwjh&jOXMz*5r`M9he<hvTcNnZI@8a|p?7dWV=60}SyIR{juyk3d
z|0eJe9xvlP*kXfXMI?C0q)h4~nBI_3oF9mR1*a|cf5rg!Xke!Uu?WwZ^L6p?UAXfH
zl_aLxL0hrU$SoRK5dKI9lkl>qjH})7Qs;0fdOs*%Nw<QwrN-UAE!5JCe`0)X!(<Hf
z&&(P776SF+6LEyO=I{<;Qm9xen5=zQf`ymV0Cl2t0iF{N4}Wf1i@uOJvCwdEMM3Xa
z@*EMpqW+r}o*~Rd{HP3Ndb9*|7(2)D!_=AB<#^d}zy4nKAiwHihfhWVc!ySX0AbNN
z{+kw_;jFK9dB@(9@KJs8p*jgZp(E@!7lO@<y1kPIInSp5Uo8Bk8^IcX$n=|1hchGZ
z5~5v>gJAmd@-4#848JV8$T=u%jn%Tf&*X>2FkL15p-->ICN3HtFYL(FXhZyl56;mK
zCoebVyn4K|9Bk4b$=f~rc7eTSxHUmU!RAtEH@)`j-3x8*PBW?i+&g2WUJCd`u9ssr
zIJ&fA++nbX%B#RM@E;Z8i<HxtpT*|T{EkEa^2Cs|MzlVee!lqjmrh{z<78aDsxnig
z-h41U$r@a#sqyjz^ugt;@+`obsS3*ov%6yz<}8;7#vZQ0BFxu;bPs*c6_)(LpRO1E
zhT2(GUHXqm4BS+zeDDYZq9^}<5r3nFX(Vgx*cktr_$b+R)e)ckKQ_di1S>AyD{+hC
z`)v)u;5NfF3XAZm8RF2~rwpUzc{$l#Fgl`s#bXiJGxX^o*#q){*{3GAmL6R4Vj8pq
z@1l0MLCf_*>soTtOe6;TkKS(}@wLus5Awr%8{4?`_a)GL*Lv5qKZYk_zsPfIJKdM-
z^PtUpxW}d!+J{L?W(>ls_?^d`0kENTrDQ)iDmx-}5d8FFbwVZB$@XduEse=ieo=HO
z!$6+J)f{<nNU^WUY4G<wBQ9x(@ab{kZR5eWy<|p|qMntzdfjAj|H)-T7r@3hf1hj*
zuG>90neY<5zK%Iyi->_A3&78pkFE6qi|i~d+*=%gby$QUvE~^L?8fz_7X2Wa{Ln3G
zt?51hwmR8Vzn62pv0ApqYS~_Ru4jE0?OpIG8$Poh*_7nMr^mE%_SvxMI6qq&ijQ!N
zSutDtNBo~=m~LSBS^{b#la9MvG+3CIo)KGZ$*aO;#re(T^`ET9LQnFl(Eb!H$9+}E
zYT4SPvH(}|s*u~;qT-f9yf8-$7U4mvDrvRRf;J|L?|ZBtA^xd*nKx;Ey!n8_F^EO4
zByR27W}$H`YiuNYmahRHl|BoV0{DoHw@oDzy?%Jd<rK&Ft5);>5W_T%JOk)>9*<g1
zVqST(@l6-(Y`gU8$SdNB)vb<c_)+uss?4%+_`*Owwh<Qc$E|H08`u~Ft!vX6bMk_4
z?467@Z*aWzwNCQ#@l;#FsRiH}?sBf=9iVvvm2L;_?V)p=%rMZoPw7_+44CV*TsH^n
zg-skX04p|V-m(P0DSUlP3w+k(ilr6!YIEFP9$5Kw*TdQ121D(;?}IJ*Ug1fN&fu6d
zyF0&tZ;i2-?*pFwb4UMe@S;5@N_@c;H-eW`fZOSc`94cAa8xbx=phV@rF)+QgZJp_
zJc<UVH}C5R2Pdyud445Wu6^L%YOtnN?o=;up18uLDDap!T^3H@pqyWCuLt)&KJR7?
ze&l(_Ee1?0^>-M6=P~+%&0uwtqnesvI=^N|ZXyOc8=Z~1f-L!&>hmTsVE&FDzWfH>
z=+|1423DLo&~O@j{z940Y49tvq3zk=g{CK5&w@{nDcgGle9|ah=^XgM(isB`*v?P;
zVi~yOP<a0L;7bcf=UxXp$TX`a2H~6Oi?sG7H5e!~N(zsIK<;hy(|h348{>xj!BZu-
zxV{2!e6~@?3*3`<NU9rr&wZD%HCQEJLy8pgq7?T<)&iWV5%x$Poagj*x(ax^!~I*j
z;N5y-=8gidn91ZBgKO`6y!ttiw&WkrS1oYCz?)-(O`j0JoUXqN-NBYG(m%ZhN2H3c
z4+paWO>Ws!vI=Y)o%)p2*}x)~n-FF`33EVvXyiK7G>uIL$fK@#YLYeybIb#WC^pRc
zB+2A`0k>H7*=G$&vr?9H5J_{@#oIGTdVBUM#FO;Kij}mI^d_Ah^djM%qI^Ty61>gP
zypDud*@pHs1Ya0e(?r7Cy4gi*9Qc{dVP_KFx?QziB)r{W$Mk6j3>Y}veNWPBcRoPV
z1w2M;)RkIr_S4LjB(2RSR$m}#U9~trn}l`oZQsKi!97zW*GGWQZ3t^7;k<d_V;c!)
ztw)zJ3FD8dO;Q`cf6i3gMZ!33P25Hj#!b08Yddf%o?Mfn2T9m6#$Jza#X#Ct)m`b}
ztnCLV61Gd;>m&=o$+mNKN!X$ilg^T`^%Xir9tO`C4%g#uqd#e|<;SB<Buhbm?bu4P
zWVa$=Ts`>m-*-QgES-~YEhJg8Z8xhXSqi>Phf0z#J!|^Sl!WQmwBz?lnABT+9Z8t3
z9Z~5gVM<Cpww8qH#I-H2NSH1iQA;LaYLBeCM#7}$Ss?ZW=i8w_^$f|9L&|CEzra&R
zZwn$>npV=k@C{gH><p<0@S5}M!`i`0v|I3{C=6V7GkJFp1OG1TE!_q-AI;Cb41S`W
zy=*^ttq#BE9Qe?e)OzyuO=ZX+mi(W~;mgg)OfWZah*bg>;S(Wv=FBVPeOF-hP)#46
zW`<Jtx09FIJ8k~Zp~-;g6G5~{YTRa+Zf1=y?fPZ>BN&&5BsY>52Zf#UBpShT>q6Yg
Q&ni)0Zf&?%_G|P10J0J=%m4rY

delta 7871
zcmchc30O_}|HtoXS}Y|c6^crG+NC186h%p;+_F@vDJmo-LMMtgBu6sVGNh~#8f7VC
z8CrxPBEldVg*Hq0y}wuAnd?5k-^~A+=b8U`p6_|i>-%|s-sgMI`7Y<2+qjacNn|z*
zVj45mG^8|>>iqRG$C|Q=DgG~)&9UI;*IAp5Y2}yosI$*b01E|RhR5ScppcDfX^d)V
zE+j;%{~dNmYKHnxpKHMnG%-Id+r}^RW>;M&tdOhqP!inj%R<WIi3i1#At9bNWOp=e
zheR7`uwR(1DU5R5rk<3Cam1y!zFOVJlF*TjYCFr-(@YS%b}+TNLnOB&SF13m3l$IA
zD)Np0iy1s5xd^jZRtiUE<n#^FI`&HgE%*<AnA4Tl&M!OjY}A`XaI{svZVs6IE}|ow
zcr0~}RuIXZ_My!AM`*>pkRpxZPV%SpkjNSjZRUrr4SDTG{IZtfeJTm4h})%=v7`G$
zG7ysOn;7S9<-jg3uTk)X+O5#Yn>6!VJAN6GNV4#XPTSijBMMr}gZj36q0NuzuulT(
zxQv*;v-?c+ii*cJ^f7#}3|h@RQ(i8#N7rsFj|sF;=gWUywtP1##LaQi9^3{-Ft;a;
zgje*4la{|CEKFikhwMQ{l<(@9I^aUrj~c{5^or8hq@;{Ias@TB7oQj`l1sg4F3!=5
zbC-x^d*djQT-OE8Kk=@7Z^55_KhB2qOV^eqTi$^qz4w=V?C$SGOg6@rSJo*S6Jwft
zdIWzG1Fv5m8yFF<6W10!B7Eob?gJ#>&YT^4K>`(v4JX)lpdzl<^_1_x_im_-YXzG&
z1WYD_g7+}x?kn(!Uw7(DfydkK&wByxOh~v**eZc1e;;fqcq`QdEdFEAW?2;B0Q`}0
zmHGs&_t9BFk}Sl1)80;HLhwsBSzh@dHnORh#;8`9j9i$?;d<O5S1_D+DJBKid|c-+
zOVSbJdK*n^$BDSROI@U)CHKn)g=|#IQt_5O`MH~r{PXI*x<4Q}JIgxq0C?}EC%<Nb
zI|EK`IRT#Vux`mZu*Cr7g45vMr=_l?f<HV;+<gu#U9!F;8N92Xk7p&=be{o_1$XQS
zh^+^^PrhXs3EuopOXW$R1<SARwJR+Q73&{YZ*GKOb87yjAn=NS#~B@9Hw~Xk7x0s3
z`klNW3w~)+=t>)~Mxg6T8E~18riU^30*^OY7Odr)wNwXuDK8<aFId(0z(P$h^Gj_=
zf3VN_Q%>sOAs6TBX$7$s{Fpd?k|HYP*EhX1hai2?hx?M?812DVJ;28vm>+wA%a>f4
zFpvcYr`*1N9$cZee{(XpIC;kNQt;&qE9a(@cy0XrpTG<J1C=wuN>1i8j)T=&$K2iu
z4qe`$cm!NLxkHdg42{Ddb{3%G<CW^Q2f_9QO`iL}`8Q>~>Pf<IwUL{^?bfV;X|M%9
zZJpc27_eb@j<hXU?$pw!QQ($Yha~O53mmM663(7>Bh4QCELPfcA-G)Smq16b%i2}^
zNO0;imxZhsDhyvA7&{LYC2hqGJHa7l{h#}TTl%&H90%VYGV96=aD?n${%P=;UdIMZ
z2XDFWI;k8yd*kEXKHz9IYn#j9#Pa=Prh!iyyWhA9E~u1f_X3A|cO}$;6~bLY-M~?i
zW7w+SP+|Q0+{+VDaWA=WhZK6OvVN7O9TB`LyrKl|8CG=I3aqQ6>oo+dW?Zdk0gew)
z^wI+_jXjY?mYl82J8dk%M?>GQ8wRd$EwvvF)=g-dYY6rzmis&#JhN-Ik2bjRAUoJT
z0u?#V0n5l5W!LC?E&)9D$nuec!RNdg)m$(aK3-7;EbU#%UIU*xU{F9NDJ9KA#kJr*
zW6r4d2B%zD*U<pZsI;2Y6TD2y^=uP(PM7Ce8L;?}Br8&%q6o`S##bJrQaC>p6dk;M
zYPJP`ZQu@>3iQLnW7G1=!OhZ4-c@k-0xcZIG)A>FmueyETVyA>uLr9@?bq16T194s
z<L_2DlUZTZm#u9)%s#JP^{5nC|AqE{r-eunvrieBeWvY7C@jHvofdDWPbQ4Hy{ep(
zah~i<!9$HU_G`PXgtk21w?TAu!*#tDLM->}g1!zKwKgV|=LXhJ=lPHuH^t-3pb6j!
z7i$ZQ!0}5?n~Vf+Emi$O9uE%gDjjPAUL7^`sTsI!s_aG$@ZN<t-VFzLv62(INKfLm
zJoU0gMRsgo8Pe01>ga#42gi?+4Y`7z*rLQY_XSJUHrJmAYgo-#NxJ?>UTOSUaIJ@7
z$xN`%t?D;N!NXmDv?W7@RbFG21=iWy7#$4O_6r{$4bIgt4-X^pr`rZxc1MNAWQ{s9
z_>A4dR2;xkr*0%J0)Nn)KVmp|*88Z;Snx;QDQiRUlmQyA<G@Mkmm^y+8Auh(KEDC{
zD6}p35O|fQ<Kg|_lMb5A1z`VP@*fU>PuDCx^CNh)!Mm!%ZG5(DZI-6v4peBd!yg=l
zVEP-6&Dr28kD|dRzzb@!q&9-rO{}?2rmqxLj{-8Cje4ip?=1L9<<`(u;H<WWrx(F_
zK{hX9z+1wW#npf<f&#r~fCt$%PkavETA?t|8hk(RxSw=8?th|s?*}HRxN^mSFNY4Y
zw%XBoC|E`Jp0x^iBG($A3V!aldyNLzC&xKd3EZ!8QBQ5~itDk9<-vZz_Y4fdW8aQ7
zA`^aj{>9;@;OXrlRt&hbXwKeo;0cAb#_!M}efmw<<w=&HhJ)4NZ%`q(flK!Td&&<9
zc@4g&sy9CX+_gKqz8U;+R>Gq|@Xh!OAx&WUA9g6u0eiJ|7Ci&2?2wL_2X?FdEf`A}
z-)m5#@<Q-x+e!Uzf!p<Do0fwcCXXLf1D2KkSj8rwf_2S3T!D(NIF*<r@CyH`w2NS?
zLEE3EfI~Lk;+KP4xG2kXaCxwA%o%Xx!vkSt%?)jf&?p6)*PKwv0E-Vf46c4C!dav`
z@7K``W{s2k4WCDK@VSq&d`5}0lM^ugxlM8cWo0TH*_l=w4^w`Yf?QvY>0_$&O-+aJ
z8AFA0>{H9Aa%%F)%m8kWd^R(Xv+JA84B{^I6)<XCrHz15=d^7F%wSH|Lck2+)D#4)
z2F@XTk{qcV7rYL0%%SGWyGeM$sWAP?I2T-d)#Udj-A_DZ4j~)W(iqj&90<FY2(3YE
z`CyVuy^x}bBK*;H^NgmqU{vR*tf_2m9mg+Q_hptOdGI^tSMmO(*rOGVeHHV|XfoBp
zREvvN5HLfz<K_Z6Z7_Y`(%~u<R3)dDu(!BI1s^4HV1+jwZ{C{Q`sn&l>T+I+ova>?
z_~eIWNhnJ0L^~|iU5v=W=IYtuSp}ZXSL!_gOy+d*CPOx=JrwwH)j-5H-*f!5S48`w
z<mY4i!39SoQ%QXI&o9$2gVS;qsz!-;TdFVkdNO$GlR_HO{Gv8r2~Dj|v%0PUanxhK
zsW#v|m+={@V9~`zJSLtCI|CHq9Zq-A%CY9I_v@#5>-{KwgKj5!PlZvOMHu7yE9o+Z
zoSjm3A0wnY6VbNTFWMR0Bc*<FmlQPf26d-Pb4-6HZBAmvwjBIE8WC#27JIyHhd_z+
zVcg9Ap^Pzi0ecf}m~t#*%I#4uX3V&mDuUVOP|!PPA#!Xfay(q*m@HCMKSJc#TI85K
zM^lY0r=%)iMsg9V0=ZEl^>$nh>PK_>0|d+%E&+Rc?hf{R&TOE78Ox<$KaOj_-hs0j
zBw!r54cL$88nK_i@zn&36SoC>XYRF{KyIRl^CZqoUBI|-2h{}wTt(_9iyXUgYJ+2$
zDcq*P$&7oE+7Ks(@!*0r1dJzl8vCijfETBvDPX+02u%Sy4avejQjuxKTZMP;=;ljm
zK^QdKyuauY)|Qmf4-gwfR7+!2OLO5VpuYLLjIWU|7=fFt8y(=&V~9L&C3w-ZoxAz1
z-A@SgqEhkK;Gbfe3{xL!yd-Q{G%+f!*E>8F#vUV+Il@7OKBewr4W?QequOG&I~k_F
z)Yu{4XcsX`KDXqKKa9?=Zj~WdV#0>$J-x(?sg}m5mgd59I`wUr&XOm-KdHsXkOt24
z8?&4x6)~^;^Bl#DshGxySTq@?GpKRawFX1dz=Qo~8%DurWc~JN!iuLB%^|l^ba+#3
zcZ~f*Op{?c6Gb?I8OMxxN}d{fo!GSh9*iV5EzkP`-sQfd>}t0$oxsGk{kG=MCX;a2
zqqN34Xy2b5_}~LLzh%nI+u+XgH<dnrk2kS%D?U0@{}*#KVit-InJH8^NZceRzFxd4
zh@5zje)A6#u^f~t>AhV5Ccm%;3faW9Wg31H`#|f<f16YY?bD%?wy1)yh9|Y;u&6K-
z82+M#3We}{M>Y}jp%Tva;PWy@PO;$LCdC&Vz?vsy-jmC_V$P*7C-B7(^>dL#FV+~e
z!4E}v1siXl^GOQD^KgCG)=|*buI{sD5pGSf!sK*4Fe|zSh>QEbzn@r$WJCVG?N$&k
ztMBF70KPl1=&mt1+jEx83-IK+jOB#I&Cv*d6yflGKVYGjCMM&zjTOVmnrLD+YmnYt
zyosw{NlJZ&3eiqN#WdC}{v#Qt0n~U>rs`=J@nu?FrnJH*t*g&gYp{=#cBc5^OSLqX
z*2R7m(`1;=rpC@w9;6M0QE}(*yW3!#Qu6B@OK=a@i@!CAHJEB?jB05vJOin3XYGhL
zYVbL-RU@&9-2eGScb;pZqN+-#{<)Yj71J2i3X`FQX%ICY&@ufEX<(zeZNVqRd}n){
zbO75%DKwEEAbN$VmZd=|rpYi3rp6PW+_ZIsk+i=_DS3HIb-SwK1r`)Ze<CLmHKtk`
zqgt8^&+n;kfS2avvlC&ouBo${yanc*Q`zndeqdkIw@b_zVxgACsFvo!G=#ga9m<4q
zjyl=Q9PYl3fSrq4;ZomG*AyCsF~hsJ%_0=ezmHR8Gr*&r<0AvR&m;{o*~GOaV~%f%
zhPL7R@S+fCb>{}nW5HA7+Sdnz!$<0tCxi8W_O~R{UF)>YwzWcU_NzHPS&5VLA|k*!
z!chMG50LEt`~vy^^8u24&JRZs&H(hIBK?R+KPu9XjH11WYH5sWX)Zh?sPA8VF0lG1
z-xlTx-y-J2Uf6S{tdJ^6$KA|HyJ<rD=#Ap^I~OtO<@=wor*9Fo=TI$;jkvgONiA|`
z?9*_`!Hsvy+WuGtxvQ0qD4Yi`Yy2c(0RAp7LU08f{rPHrIoMO5eer>O5vC`jCr6_e
z(BDnp9O#<_eY2o%5~A0W#;BI&QY}0qQT|+XSuA${-m3eTi|#@+#E1P?S6y7{zgcwI
zf3oUEq2<EAP#Wuamt1h)w<j)8C65OIj>FVL!8hErkCEAj+#329in#W~>upQjL-1Vk
zRHlHN2XO*#jh;7>&7PXN5*9au*CG^QXBD5S1~(R_uSf3coP-hL)10{Wn`w=#OaFUb
z`#P<On~O6V6^$Ys{5RVZo5^1r?}JZeJcReuqRtBPWaoDF?J4qPC)!zwmi;R+Ok@73
z@!$9^?)GJQbZmO+e;tZ+Y|^nR+G47uF{-7xFpZ@RZjO)8w#6FvICNJb`G?8mWuOFE
z11(R-zJ2@0l`w=H8x_+a71Lx$mT+qN$;?u2kN#yQj*BpeWtMTj8HBRS5fhH*vhg~(
zuIK}=H<b1ukBeuGWX6%sST^lY9_@_uAzEB(xFhwE7qkbr^Mn2`eeq9kzpv(K#0nH)
mAILNwdp{gz`?YSIAt&Cb!v-w^f7BjtF8-Q8wKPVxH1|K`F%`uC

diff --git a/GIS Base Map/fencing.shx b/GIS Base Map/fencing.shx
index 78ad64bcedf39f1e3375460c976a6063d32c204b..a8739b79b1bed6e8e8c21227e557f66b0aeb0b22 100644
GIT binary patch
literal 1092
zcmZwGF=*3K5XbRLENPmgO`4=>G_eE`?ch+-4vr6};MBpvK_p0#3`Hx5C@5qs;*g3s
zXon&W9XeESa43>VIy$I0X$FTP4nai_I{3Z3-y$^p|9rT6_wL>QLCnr(?8sm8)WI<`
z9{col<LRw-Gd#byxL^1i`Wvsh#p-G^JovbHbN*N8AG!ViWRq~7_o{q|=Xu{L{)r1_
zi8C>uxQ4rC$qFWU>SklhW~nt|`lL4HzWf~>Z(zr4{1FCxk1ew_`#ny#k^O03ci+fw
z7|bTf*<E~z%r`NJW_&+=G93)Kg9|u_X3I!@mKp6b`Z~R`pD~GFq@UyQcR7@Q<Y6>N
zjo0PUNT1x2Y%70V@niW`dSB`%{odRQ@`ijSb?=jY@6=7r$&2!ie1Xg{wXOI=G!LH7
zr(_QK{(K7q`u%R16}ThsU$`RI<!d>>uG#cTjHi2YPaZ^ze!ui72Dys#E^c89f5d#L
zie0nPCNfXS@1MG|&lhkR+vw-BULGRrGpCXMGrsQLm)la`?bqt-m2=3xN?SfrzArV;
ztj`n7X8rqnIE-<12|2&ICU=m&Ri77+k4erL#lGM3>(b}nH9OJ49v;SgjT*13T|)NO
tyuNEz_wOfP=gg5SlD(sN52>#YV|=nMTk<yl&9>Pb^Cf~=L+g#v`adwtZBqaM

literal 1100
zcmZwDF=*3K5XbRLYN3Q^{z?C}sY#Ovl6DXYQN%&yAr3`4h&U7xE#lBYN?oKb;!vbW
z2kYRV4y8DBk|+)$MKVc;A|g^mq=Izl;2`Rvli%z6EkZ-WC-?5%-T!}PBRSjklWlJI
znDMoZuZs_FOt!=0TSwQDKcTz${7$KSy&VqDeZDgCD|B})|NpQ}ILhy`yoV?Fy^UtF
z*fPr;$8)HB#`Dx=e#U&ZiPUAU;tX!Yd=K@RPiA{Ii92S!58`?68_wvLE5$f>ihEtN
zyw9U={)oIN@5&cAWwy750e#*WK2z+^L;XI_yJzK1xh&sd%dDVz1<fmHUcu*)D=c8Z
z_c&{ojK?^+kMvJgkv_=}<T;8b<$OFZDqr+G`zam93G_VmrI*N@(rek3zF$9Immeg%
z+&SNrTS%Y&MEZQ{`cEsKmXD<O_50dWsy(IJQ>s0s%kf_7d*XijH#*Ri=jCl=-oTvV
zj{KtYZ*m)X|NVzB;1n*I4d#*lgXDI+hJkoR@yBQxJYV+xxf4=z%bHvEx#WlXFyJ_H
zcW6cNcO-wn8@gxYjC>;3<nL&ufi1Jj1suaAq`tBq<Er<gM|B~dS6|7k=x~D64PR0`
zkAc|hdA=IGd_OgRf9};f$XQMAQ}2s${g|A@U{-&M{BL-k`i8#`&)Jy8fU7wA56OaX
AMF0Q*

diff --git a/GIS Base Map/water_tables.dbf b/GIS Base Map/water_tables.dbf
index 8ae836adaf8872a2be12045049056ef90303209e..2041f6b58bccd4515c9f2fb9327c0ac8f2be20bb 100644
GIT binary patch
delta 13
UcmZo=Z)Im;uI6Ol$kNCR02Jl|<NyEw

delta 13
UcmZo=Z)Im;j%SzJ$kNCR02Fls*#H0l

diff --git a/GIS Base Map/water_tables.shp b/GIS Base Map/water_tables.shp
index 8f62d5ba04cdba2d89350230d2e17398ea0246a1..c088393ddf7100cbd911c32194f83ddeeb1a67d4 100644
GIT binary patch
delta 155
zcmbQkv4DMo6cgixjWQ)n^-C>eMWPdp93~&Q`|J8whXV!Q6BE;be5>v)3Ri)AMg|53
zRv-oe%_fz0WVJB8BIUEXL3&l4`LCrS>4lkfhgYElWEQ%9ppl$xK!OQm_~a?f9RSFU
BJcs}Q

delta 280
zcmZ3$K8It16cZEQMwt?(`VALupV*ja<ZzBP<^J}s4hQzE4!O7$$k*97TWk}M&&a^Q
zzzW15@Xhheoh?XmFtw@?#|=ShYZq87+Js~ly4mRZfkxJ|0SO0?1ut4Y2kr!Fc3=Ko
zau?9B+sCDj?*;OY#)h8UjOGyOBWc_BAj!eh?*HEK1f+J6(&d_6K=}X%vyVH0d~~xB
N`q?0cPnKZr002-&fKLDb

diff --git a/GIS Base Map/water_tables.shx b/GIS Base Map/water_tables.shx
index 7db94036f6594d6bb7f31eb1e8b52d6229c4e30e..8ba98f85af3f30dce604a08322e05090978bf608 100644
GIT binary patch
delta 16
XcmbQkIEQh<WKJdq2F4x+1_lQJBJ%?_

delta 16
XcmbQkIEQh<WKIVL2F6ni3=9qcCRYQp